Changeset 132ab5d1 in mainline for uspace/srv/vfs/vfs_ipc.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/srv/vfs/vfs_ipc.c (modified) (2 diffs)

uspace/srv/vfs/vfs_ipc.c

@@ -41 +41 @@
         bool desc = IPC_GET_ARG3(*request);
         
-        int ret = vfs_op_clone(oldfd, newfd, desc);
-        async_answer_0(rid, ret);
+        int outfd = -1;
+        int rc = vfs_op_clone(oldfd, newfd, desc, &outfd);
+        async_answer_1(rid, rc, outfd);
 }
 
@@ -279 +280 @@
 {
         bool high_fd = IPC_GET_ARG1(*request);
-        int fd = vfs_op_wait_handle(high_fd);
-        async_answer_1(rid, EOK, fd);
+        int fd = -1;
+        int rc = vfs_op_wait_handle(high_fd, &fd);
+        async_answer_1(rid, rc, fd);
 }