Changes in uspace/srv/loader/main.c [b7fd2a0:8d2dd7f2] in mainline

File:

• uspace/srv/loader/main.c (modified) (9 diffs)

uspace/srv/loader/main.c

@@ -119 +119 @@
 {
         char *buf;
-        errno_t rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL);
+        int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, NULL);
         
         if (rc == EOK) {
@@ -146 +146 @@
 
         char* name = malloc(namesize);
-        errno_t rc = async_data_write_finalize(writeid, name, namesize);
+        int rc = async_data_write_finalize(writeid, name, namesize);
         if (rc != EOK) {
                 async_answer_0(rid, EINVAL);
@@ -152 +152 @@
         }
 
-        int file;
-        rc = vfs_receive_handle(true, &file);
-        if (rc != EOK) {
+        int file = vfs_receive_handle(true);
+        if (file < 0) {
                 async_answer_0(rid, EINVAL);
                 return;
@@ -173 +172 @@
         char *buf;
         size_t buf_size;
-        errno_t rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, &buf_size);
+        int rc = async_data_write_accept((void **) &buf, true, 0, 0, 0, &buf_size);
         
         if (rc == EOK) {
@@ -249 +248 @@
 
         char* name = malloc(namesize);
-        errno_t rc = async_data_write_finalize(writeid, name, namesize);
+        int rc = async_data_write_finalize(writeid, name, namesize);
         if (rc != EOK) {
                 async_answer_0(rid, EINVAL);
@@ -255 +254 @@
         }
 
-        int file;
-        rc = vfs_receive_handle(true, &file);
-        if (rc != EOK) {
+        int file = vfs_receive_handle(true);
+        if (file < 0) {
                 async_answer_0(rid, EINVAL);
                 return;
@@ -300 +298 @@
         pcb.inbox_entries = inbox_entries;
         
-        async_answer_0(rid, EOK);
+        async_answer_0(rid, rc);
         return 0;
 }
@@ -349 +347 @@
         
         while (true) {
-                errno_t retval;
+                int retval;
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
@@ -395 +393 @@
         /* Introduce this task to the NS (give it our task ID). */
         task_id_t id = task_get_id();
-        errno_t rc = ns_intro(id);
+        int rc = ns_intro(id);
         if (rc != EOK)
                 return rc;