Changeset a46e56b in mainline for uspace/srv/fs/tmpfs/tmpfs_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/tmpfs/tmpfs_ops.c (modified) (8 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -484 +484 @@
          * Receive the read request.
          */
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         size_t size;
-        if (!async_data_read_receive(&callid, &size)) {
-                async_answer_0(callid, EINVAL);
+        if (!async_data_read_receive(&chandle, &size)) {
+                async_answer_0(chandle, EINVAL);
                 return EINVAL;
         }
@@ -494 +494 @@
         if (nodep->type == TMPFS_FILE) {
                 bytes = min(nodep->size - pos, size);
-                (void) async_data_read_finalize(callid, nodep->data + pos,
+                (void) async_data_read_finalize(chandle, nodep->data + pos,
                     bytes);
         } else {
@@ -510 +510 @@
 
                 if (lnk == NULL) {
-                        async_answer_0(callid, ENOENT);
+                        async_answer_0(chandle, ENOENT);
                         return ENOENT;
                 }
@@ -516 +516 @@
                 dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
 
-                (void) async_data_read_finalize(callid, dentryp->name,
+                (void) async_data_read_finalize(chandle, dentryp->name,
                     str_size(dentryp->name) + 1);
                 bytes = 1;
@@ -547 +547 @@
          * Receive the write request.
          */
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         size_t size;
-        if (!async_data_write_receive(&callid, &size)) {
-                async_answer_0(callid, EINVAL);
+        if (!async_data_write_receive(&chandle, &size)) {
+                async_answer_0(chandle, EINVAL);
                 return EINVAL;
         }
@@ -559 +559 @@
         if (pos + size <= nodep->size) {
                 /* The file size is not changing. */
-                (void) async_data_write_finalize(callid, nodep->data + pos,
+                (void) async_data_write_finalize(chandle, nodep->data + pos,
                     size);
                 goto out;
@@ -573 +573 @@
         void *newdata = realloc(nodep->data, nodep->size + delta);
         if (!newdata) {
-                async_answer_0(callid, ENOMEM);
+                async_answer_0(chandle, ENOMEM);
                 size = 0;
                 goto out;
@@ -581 +581 @@
         nodep->size += delta;
         nodep->data = newdata;
-        (void) async_data_write_finalize(callid, nodep->data + pos, size);
+        (void) async_data_write_finalize(chandle, nodep->data + pos, size);
 
 out: