Changeset a46e56b in mainline for uspace/srv/fs/cdfs/cdfs_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/cdfs/cdfs_ops.c (modified) (5 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -1271 +1271 @@
         }
 
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         size_t len;
-        if (!async_data_read_receive(&callid, &len)) {
-                async_answer_0(callid, EINVAL);
+        if (!async_data_read_receive(&chandle, &len)) {
+                async_answer_0(chandle, EINVAL);
                 return EINVAL;
         }
@@ -1281 +1281 @@
                 if (pos >= node->size) {
                         *rbytes = 0;
-                        async_data_read_finalize(callid, NULL, 0);
+                        async_data_read_finalize(chandle, NULL, 0);
                 } else {
                         cdfs_lba_t lba = pos / BLOCK_SIZE;
@@ -1293 +1293 @@
                             BLOCK_FLAGS_NONE);
                         if (rc != EOK) {
-                                async_answer_0(callid, rc);
+                                async_answer_0(chandle, rc);
                                 return rc;
                         }
 
-                        async_data_read_finalize(callid, block->data + offset,
+                        async_data_read_finalize(chandle, block->data + offset,
                             *rbytes);
                         rc = block_put(block);
@@ -1306 +1306 @@
                 link_t *link = list_nth(&node->cs_list, pos);
                 if (link == NULL) {
-                        async_answer_0(callid, ENOENT);
+                        async_answer_0(chandle, ENOENT);
                         return ENOENT;
                 }
@@ -1314 +1314 @@
 
                 *rbytes = 1;
-                async_data_read_finalize(callid, dentry->name,
+                async_data_read_finalize(chandle, dentry->name,
                     str_size(dentry->name) + 1);
         }