Changeset 4c53333 in mainline for uspace/srv/loader/main.c

Timestamp:

2013-07-11T08:21:10Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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 mainline changes

File:

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

uspace/srv/loader/main.c

@@ -47 +47 @@
 #include <stdlib.h>
 #include <unistd.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -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();