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

uspace/srv/fs/udf/udf_ops.c

@@ -464 +464 @@
         udf_node_t *node = UDF_NODE(rfn);
 
-        cap_call_handle_t callid;
+        cap_call_handle_t chandle;
         size_t len = 0;
-        if (!async_data_read_receive(&callid, &len)) {
-                async_answer_0(callid, EINVAL);
+        if (!async_data_read_receive(&chandle, &len)) {
+                async_answer_0(chandle, EINVAL);
                 udf_node_put(rfn);
                 return EINVAL;
@@ -475 +475 @@
                 if (pos >= node->data_size) {
                         *rbytes = 0;
-                        async_data_read_finalize(callid, NULL, 0);
+                        async_data_read_finalize(chandle, NULL, 0);
                         udf_node_put(rfn);
                         return EOK;
@@ -482 +482 @@
                 size_t read_len = 0;
                 if (node->data == NULL)
-                        rc = udf_read_file(&read_len, callid, node, pos, len);
+                        rc = udf_read_file(&read_len, chandle, node, pos, len);
                 else {
                         /* File in allocation descriptors area */
                         read_len = (len < node->data_size) ? len : node->data_size;
-                        async_data_read_finalize(callid, node->data + pos, read_len);
+                        async_data_read_finalize(chandle, node->data + pos, read_len);
                         rc = EOK;
                 }
@@ -505 +505 @@
                             fid->lenght_file_id, &node->instance->charset);
 
-                        async_data_read_finalize(callid, name, str_size(name) + 1);
+                        async_data_read_finalize(chandle, name, str_size(name) + 1);
                         *rbytes = 1;
                         free(name);
@@ -517 +517 @@
                         *rbytes = 0;
                         udf_node_put(rfn);
-                        async_answer_0(callid, ENOENT);
+                        async_answer_0(chandle, ENOENT);
                         return ENOENT;
                 }