Changeset 85a4350 in mainline for uspace/srv/loader/main.c

Timestamp:

2012-06-03T15:09:27Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

652b776

Parents:

840e227 (diff), 3123d2a (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 with mainline

File:

• uspace/srv/loader/main.c (modified) (1 diff)

uspace/srv/loader/main.c

@@ -450 +450 @@
         int rc = ns_intro(id);
         if (rc != EOK)
-                return -1;
+                return rc;
         
         /* Register at naming service. */
-        if (service_register(SERVICE_LOAD) != EOK)
-                return -2;
+        rc = service_register(SERVICE_LOAD);
+        if (rc != EOK)
+                return rc;
         
         async_manager();