Changeset b74959bd in mainline for uspace/srv/vfs/vfs_open.c

Timestamp:

2007-11-20T21:33:32Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8498915

Parents:

3209923

Message:

Modify ipc_answer_*() to make use of all six syscall arguments. The recommended
means of answering calls is via the ipc_answer_m() macros (where m denotes the
number of return arguments) that automatically decide between the fast register
version or the slow universal version of ipc_answer().

File:

• uspace/srv/vfs/vfs_open.c (modified) (6 diffs)

uspace/srv/vfs/vfs_open.c

@@ -47 +47 @@
 {
         if (!vfs_files_init()) {
-                ipc_answer_fast_0(rid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
                 return;
         }
@@ -61 +61 @@
 
         ipc_callid_t callid;
-        ipc_call_t call;
 
-        if (!ipc_data_receive(&callid, &call, NULL, &size)) {
-                ipc_answer_fast_0(callid, EINVAL);
-                ipc_answer_fast_0(rid, EINVAL);
+        if (!ipc_data_receive(&callid, NULL, &size)) {
+                ipc_answer_0(callid, EINVAL);
+                ipc_answer_0(rid, EINVAL);
                 return;
         }
@@ -78 +77 @@
         
         if (!path) {
-                ipc_answer_fast_0(callid, ENOMEM);
-                ipc_answer_fast_0(rid, ENOMEM);
+                ipc_answer_0(callid, ENOMEM);
+                ipc_answer_0(rid, ENOMEM);
                 return;
         }
 
         int rc;
-        if ((rc = ipc_data_deliver(callid, &call, path, size))) {
-                ipc_answer_fast_0(rid, rc);
+        if ((rc = ipc_data_deliver(callid, path, size))) {
+                ipc_answer_0(rid, rc);
                 free(path);
                 return;
@@ -104 +103 @@
         if (rc) {
                 futex_up(&unlink_futex);
-                ipc_answer_fast_0(rid, rc);
+                ipc_answer_0(rid, rc);
                 free(path);
                 return;
@@ -124 +123 @@
         if (fd < 0) {
                 vfs_node_put(node);
-                ipc_answer_fast_0(rid, fd);
+                ipc_answer_0(rid, fd);
                 return;
         }
@@ -143 +142 @@
          * Success! Return the new file descriptor to the client.
          */
-        ipc_answer_fast_1(rid, EOK, fd);
+        ipc_answer_1(rid, EOK, fd);
 }