Changeset a46e56b in mainline for uspace/srv/fs/exfat/exfat_ops.c

Timestamp:

2018-03-22T06:49:35Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

77f0a1d

Parents:

3e242d2

git-author:

Jakub Jermar <jakub@…> (2018-03-21 23:29:06)

git-committer:

Jakub Jermar <jakub@…> (2018-03-22 06:49:35)

Message:

Prefer handle over ID in naming handle variables

File:

• uspace/srv/fs/exfat/exfat_ops.c (modified) (10 diffs)

uspace/srv/fs/exfat/exfat_ops.c

@@ -1337 +1337 @@
         nodep = EXFAT_NODE(fn);
 
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         size_t len;
-        if (!async_data_read_receive(&callid, &len)) {
+        if (!async_data_read_receive(&chandle, &len)) {
                 exfat_node_put(fn);
-                async_answer_0(callid, EINVAL);
+                async_answer_0(chandle, EINVAL);
                 return EINVAL;
         }
@@ -1356 +1356 @@
                         /* reading beyond the EOF */
                         bytes = 0;
-                        (void) async_data_read_finalize(callid, NULL, 0);
+                        (void) async_data_read_finalize(chandle, NULL, 0);
                 } else {
                         bytes = min(len, BPS(bs) - pos % BPS(bs));
@@ -1364 +1364 @@
                         if (rc != EOK) {
                                 exfat_node_put(fn);
-                                async_answer_0(callid, rc);
+                                async_answer_0(chandle, rc);
                                 return rc;
                         }
-                        (void) async_data_read_finalize(callid,
+                        (void) async_data_read_finalize(chandle,
                             b->data + pos % BPS(bs), bytes);
                         rc = block_put(b);
@@ -1377 +1377 @@
         } else {
                 if (nodep->type != EXFAT_DIRECTORY) {
-                        async_answer_0(callid, ENOTSUP);
+                        async_answer_0(chandle, ENOTSUP);
                         return ENOTSUP;
                 }
@@ -1411 +1411 @@
 err:
                 (void) exfat_node_put(fn);
-                async_answer_0(callid, rc);
+                async_answer_0(chandle, rc);
                 return rc;
 
@@ -1419 +1419 @@
                         goto err;
                 rc = exfat_node_put(fn);
-                async_answer_0(callid, rc != EOK ? rc : ENOENT);
+                async_answer_0(chandle, rc != EOK ? rc : ENOENT);
                 *rbytes = 0;
                 return rc != EOK ? rc : ENOENT;
@@ -1428 +1428 @@
                 if (rc != EOK)
                         goto err;
-                (void) async_data_read_finalize(callid, name,
+                (void) async_data_read_finalize(chandle, name,
                     str_size(name) + 1);
                 bytes = (pos - spos) + 1;
@@ -1481 +1481 @@
         nodep = EXFAT_NODE(fn);
 
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         size_t len;
-        if (!async_data_write_receive(&callid, &len)) {
+        if (!async_data_write_receive(&chandle, &len)) {
                 (void) exfat_node_put(fn);
-                async_answer_0(callid, EINVAL);
+                async_answer_0(chandle, EINVAL);
                 return EINVAL;
         }
@@ -1510 +1510 @@
                         /* could not expand node */
                         (void) exfat_node_put(fn);
-                        async_answer_0(callid, rc);
+                        async_answer_0(chandle, rc);
                         return rc;
                 }
@@ -1529 +1529 @@
         if (rc != EOK) {
                 (void) exfat_node_put(fn);
-                async_answer_0(callid, rc);
-                return rc;
-        }
-
-        (void) async_data_write_finalize(callid,
+                async_answer_0(chandle, rc);
+                return rc;
+        }
+
+        (void) async_data_write_finalize(chandle,
             b->data + pos % BPS(bs), bytes);
         b->dirty = true;                /* need to sync block */