Changeset ab87db5 in mainline for uspace/lib/fs/libfs.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/lib/fs/libfs.c (modified) (17 diffs)

uspace/lib/fs/libfs.c

@@ -79 +79 @@
 static void vfs_out_fsprobe(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
         errno_t rc;
         vfs_fs_probe_info_t info;
@@ -106 +106 @@
 static void vfs_out_mounted(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
         char *opts;
         errno_t rc;
@@ -132 +132 @@
 static void vfs_out_unmounted(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
         errno_t rc;
 
@@ -152 +152 @@
 static void vfs_out_read(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
-        aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*req),
-            IPC_GET_ARG4(*req));
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
+        aoff64_t pos = (aoff64_t) MERGE_LOUP32(ipc_get_arg3(req),
+            ipc_get_arg4(req));
         size_t rbytes;
         errno_t rc;
@@ -169 +169 @@
 static void vfs_out_write(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
-        aoff64_t pos = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*req),
-            IPC_GET_ARG4(*req));
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
+        aoff64_t pos = (aoff64_t) MERGE_LOUP32(ipc_get_arg3(req),
+            ipc_get_arg4(req));
         size_t wbytes;
         aoff64_t nsize;
@@ -188 +188 @@
 static void vfs_out_truncate(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
-        aoff64_t size = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*req),
-            IPC_GET_ARG4(*req));
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
+        aoff64_t size = (aoff64_t) MERGE_LOUP32(ipc_get_arg3(req),
+            ipc_get_arg4(req));
         errno_t rc;
 
@@ -201 +201 @@
 static void vfs_out_close(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
         errno_t rc;
 
@@ -212 +212 @@
 static void vfs_out_destroy(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
 
         errno_t rc;
@@ -239 +239 @@
 static void vfs_out_sync(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
         errno_t rc;
 
@@ -255 +255 @@
 static void vfs_out_is_empty(ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
         errno_t rc;
 
@@ -290 +290 @@
                 async_get_call(&call);
 
-                if (!IPC_GET_IMETHOD(call)) {
+                if (!ipc_get_imethod(&call)) {
                         async_answer_0(&call, EOK);
                         return;
                 }
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case VFS_OUT_FSPROBE:
                         vfs_out_fsprobe(&call);
@@ -424 +424 @@
          */
         async_wait_for(req, NULL);
-        reg.fs_handle = (int) IPC_GET_ARG1(answer);
-
-        return IPC_GET_RETVAL(answer);
+        reg.fs_handle = (int) ipc_get_arg1(&answer);
+
+        return ipc_get_retval(&answer);
 }
 
@@ -490 +490 @@
 void libfs_link(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req)
 {
-        service_id_t parent_sid = IPC_GET_ARG1(*req);
-        fs_index_t parent_index = IPC_GET_ARG2(*req);
-        fs_index_t child_index = IPC_GET_ARG3(*req);
+        service_id_t parent_sid = ipc_get_arg1(req);
+        fs_index_t parent_index = ipc_get_arg2(req);
+        fs_index_t child_index = ipc_get_arg3(req);
 
         char component[NAME_MAX + 1];
@@ -536 +536 @@
 void libfs_lookup(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req)
 {
-        unsigned first = IPC_GET_ARG1(*req);
-        unsigned len = IPC_GET_ARG2(*req);
-        service_id_t service_id = IPC_GET_ARG3(*req);
-        fs_index_t index = IPC_GET_ARG4(*req);
-        int lflag = IPC_GET_ARG5(*req);
+        unsigned first = ipc_get_arg1(req);
+        unsigned len = ipc_get_arg2(req);
+        service_id_t service_id = ipc_get_arg3(req);
+        fs_index_t index = ipc_get_arg4(req);
+        int lflag = ipc_get_arg5(req);
 
         // TODO: Validate flags.
@@ -716 +716 @@
 void libfs_stat(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
 
         fs_node_t *fn;
@@ -753 +753 @@
 void libfs_statfs(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req)
 {
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
+        service_id_t service_id = (service_id_t) ipc_get_arg1(req);
+        fs_index_t index = (fs_index_t) ipc_get_arg2(req);
 
         fs_node_t *fn;
@@ -810 +810 @@
 void libfs_open_node(libfs_ops_t *ops, fs_handle_t fs_handle, ipc_call_t *req)
 {
-        service_id_t service_id = IPC_GET_ARG1(*req);
-        fs_index_t index = IPC_GET_ARG2(*req);
+        service_id_t service_id = ipc_get_arg1(req);
+        fs_index_t index = ipc_get_arg2(req);
 
         fs_node_t *fn;