Changeset ab87db5 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2019-02-23T17:16:01Z (5 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8c193d83, ca0e838

Parents:

bc417660 (diff), 95a47b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-23 17:16:01)

git-committer:

GitHub <noreply@…> (2019-02-23 17:16:01)

Message:

Merge pull request #157

Turn some function-like macros into functions

File:

• uspace/srv/vfs/vfs_ops.c (modified) (4 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -168 +168 @@
         res.triplet.fs_handle = fs_handle;
         res.triplet.service_id = service_id;
-        res.triplet.index = (fs_index_t) IPC_GET_ARG1(answer);
-        res.size = (int64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
-            IPC_GET_ARG3(answer));
+        res.triplet.index = (fs_index_t) ipc_get_arg1(&answer);
+        res.size = (int64_t) MERGE_LOUP32(ipc_get_arg2(&answer),
+            ipc_get_arg3(&answer));
         res.type = VFS_NODE_DIRECTORY;
 
@@ -374 +374 @@
         }
 
-        *bytes = IPC_GET_ARG1(*answer);
+        *bytes = ipc_get_arg1(answer);
         return rc;
 }
@@ -401 +401 @@
         async_wait_for(msg, &rc);
 
-        chunk->size = IPC_GET_ARG1(*answer);
+        chunk->size = ipc_get_arg1(answer);
 
         return (errno_t) rc;
@@ -488 +488 @@
                 /* Update the cached version of node's size. */
                 if (rc == EOK) {
-                        file->node->size = MERGE_LOUP32(IPC_GET_ARG2(answer),
-                            IPC_GET_ARG3(answer));
+                        file->node->size = MERGE_LOUP32(ipc_get_arg2(&answer),
+                            ipc_get_arg3(&answer));
                 }
                 fibril_rwlock_write_unlock(&file->node->contents_rwlock);