Changeset a46e56b in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2018-03-22T06:49:35Z (6 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/mfs/mfs_ops.c (modified) (9 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -837 +837 @@
         struct mfs_ino_info *ino_i;
         size_t len, bytes = 0;
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
 
         mnode = fn->data;
         ino_i = mnode->ino_i;
 
-        if (!async_data_read_receive(&callid, &len)) {
+        if (!async_data_read_receive(&chandle, &len)) {
                 rc = EINVAL;
                 goto out_error;
@@ -869 +869 @@
 
                 rc = mfs_node_put(fn);
-                async_answer_0(callid, rc != EOK ? rc : ENOENT);
+                async_answer_0(chandle, rc != EOK ? rc : ENOENT);
                 return rc;
 found:
-                async_data_read_finalize(callid, d_info.d_name,
+                async_data_read_finalize(chandle, d_info.d_name,
                     str_size(d_info.d_name) + 1);
                 bytes = ((pos - spos) + 1);
@@ -881 +881 @@
                         /* Trying to read beyond the end of file */
                         bytes = 0;
-                        (void) async_data_read_finalize(callid, NULL, 0);
+                        (void) async_data_read_finalize(chandle, NULL, 0);
                         goto out_success;
                 }
@@ -903 +903 @@
                         }
                         memset(buf, 0, sizeof(sbi->block_size));
-                        async_data_read_finalize(callid,
+                        async_data_read_finalize(chandle,
                             buf + pos % sbi->block_size, bytes);
                         free(buf);
@@ -913 +913 @@
                         goto out_error;
 
-                async_data_read_finalize(callid, b->data +
+                async_data_read_finalize(chandle, b->data +
                     pos % sbi->block_size, bytes);
 
@@ -928 +928 @@
 out_error:
         tmp = mfs_node_put(fn);
-        async_answer_0(callid, tmp != EOK ? tmp : rc);
+        async_answer_0(chandle, tmp != EOK ? tmp : rc);
         return tmp != EOK ? tmp : rc;
 }
@@ -946 +946 @@
                 return ENOENT;
 
-        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)) {
                 r = EINVAL;
                 goto out_err;
@@ -992 +992 @@
                 memset(b->data, 0, sbi->block_size);
 
-        async_data_write_finalize(callid, b->data + (pos % bs), bytes);
+        async_data_write_finalize(chandle, b->data + (pos % bs), bytes);
         b->dirty = true;
 
@@ -1012 +1012 @@
 out_err:
         mfs_node_put(fn);
-        async_answer_0(callid, r);
+        async_answer_0(chandle, r);
         return r;
 }