Changeset ab87db5 in mainline for uspace/srv/vfs/vfs_lookup.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_lookup.c (modified) (1 diff)

uspace/srv/vfs/vfs_lookup.c

@@ -226 +226 @@
 
         unsigned last = *pfirst + *plen;
-        *pfirst = IPC_GET_ARG3(answer) & 0xffff;
+        *pfirst = ipc_get_arg3(&answer) & 0xffff;
         *plen = last - *pfirst;
 
-        result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer);
+        result->triplet.fs_handle = (fs_handle_t) ipc_get_arg1(&answer);
         result->triplet.service_id = base->service_id;
-        result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
-        result->size = MERGE_LOUP32(IPC_GET_ARG4(answer), IPC_GET_ARG5(answer));
-        result->type = (IPC_GET_ARG3(answer) >> 16) ?
+        result->triplet.index = (fs_index_t) ipc_get_arg2(&answer);
+        result->size = MERGE_LOUP32(ipc_get_arg4(&answer), ipc_get_arg5(&answer));
+        result->type = (ipc_get_arg3(&answer) >> 16) ?
             VFS_NODE_DIRECTORY : VFS_NODE_FILE;
         return EOK;