Changeset 132ab5d1 in mainline for uspace/srv/loader/main.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/loader/main.c (modified) (3 diffs)

uspace/srv/loader/main.c

@@ -152 +152 @@
         }
 
-        int file = vfs_receive_handle(true);
-        if (file < 0) {
+        int file;
+        rc = vfs_receive_handle(true, &file);
+        if (rc != EOK) {
                 async_answer_0(rid, EINVAL);
                 return;
@@ -254 +255 @@
         }
 
-        int file = vfs_receive_handle(true);
-        if (file < 0) {
+        int file;
+        rc = vfs_receive_handle(true, &file);
+        if (rc != EOK) {
                 async_answer_0(rid, EINVAL);
                 return;
@@ -298 +300 @@
         pcb.inbox_entries = inbox_entries;
         
-        async_answer_0(rid, rc);
+        async_answer_0(rid, EOK);
         return 0;
 }