Changeset a46e56b in mainline for uspace/srv/fs/locfs/locfs_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/locfs/locfs_ops.c (modified) (11 diffs)

uspace/srv/fs/locfs/locfs_ops.c

@@ -478 +478 @@
 {
         if (index == 0) {
-                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;
                 }
@@ -500 +500 @@
 
                 if (pos < count) {
-                        async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1);
+                        async_data_read_finalize(chandle, desc[pos].name, str_size(desc[pos].name) + 1);
                         free(desc);
                         *rbytes = 1;
@@ -515 +515 @@
 
                         if (pos < count) {
-                                async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1);
+                                async_data_read_finalize(chandle, desc[pos].name, str_size(desc[pos].name) + 1);
                                 free(desc);
                                 *rbytes = 1;
@@ -524 +524 @@
                 }
 
-                async_answer_0(callid, ENOENT);
+                async_answer_0(chandle, ENOENT);
                 return ENOENT;
         }
@@ -532 +532 @@
         if (type == LOC_OBJECT_NAMESPACE) {
                 /* Namespace directory */
-                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;
                 }
@@ -543 +543 @@
 
                 if (pos < count) {
-                        async_data_read_finalize(callid, desc[pos].name, str_size(desc[pos].name) + 1);
+                        async_data_read_finalize(chandle, desc[pos].name, str_size(desc[pos].name) + 1);
                         free(desc);
                         *rbytes = 1;
@@ -550 +550 @@
 
                 free(desc);
-                async_answer_0(callid, ENOENT);
+                async_answer_0(chandle, ENOENT);
                 return ENOENT;
         }
@@ -568 +568 @@
                 assert(dev->sess);
 
-                cap_call_handle_t callid;
-                if (!async_data_read_receive(&callid, NULL)) {
+                cap_call_handle_t chandle;
+                if (!async_data_read_receive(&chandle, NULL)) {
                         fibril_mutex_unlock(&services_mutex);
-                        async_answer_0(callid, EINVAL);
+                        async_answer_0(chandle, EINVAL);
                         return EINVAL;
                 }
@@ -583 +583 @@
 
                 /* Forward the IPC_M_DATA_READ request to the driver */
-                async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+                async_forward_fast(chandle, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
 
                 async_exchange_end(exch);
@@ -632 +632 @@
                 assert(dev->sess);
 
-                cap_call_handle_t callid;
-                if (!async_data_write_receive(&callid, NULL)) {
+                cap_call_handle_t chandle;
+                if (!async_data_write_receive(&chandle, NULL)) {
                         fibril_mutex_unlock(&services_mutex);
-                        async_answer_0(callid, EINVAL);
+                        async_answer_0(chandle, EINVAL);
                         return EINVAL;
                 }
@@ -647 +647 @@
 
                 /* Forward the IPC_M_DATA_WRITE request to the driver */
-                async_forward_fast(callid, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
+                async_forward_fast(chandle, exch, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
 
                 async_exchange_end(exch);