Changeset 9fd39d6 in mainline for uspace/app/netstart/netstart.c

Timestamp:

2010-11-07T19:15:39Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

16ac756

Parents:

68f0c3a (diff), 3da12d74 (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/app/netstart/netstart.c (modified) (4 diffs)

uspace/app/netstart/netstart.c

@@ -41 +41 @@
 #include <task.h>
 #include <str_error.h>
-#include <err.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
@@ -57 +56 @@
 static bool spawn(const char *desc, const char *path)
 {
+        int rc;
+
         printf("%s: Spawning %s (%s)\n", NAME, desc, path);
-        
-        const char *argv[2];
-        
-        argv[0] = path;
-        argv[1] = NULL;
-        
-        int err;
-        if (task_spawn(path, argv, &err) == 0) {
+        rc = task_spawnl(NULL, path, path, NULL);
+        if (rc != EOK) {
                 fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, path,
-                    str_error(err));
+                    str_error(rc));
                 return false;
         }
@@ -76 +71 @@
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
+        int rc;
         
         if (!spawn("networking service", "/srv/net"))
@@ -84 +79 @@
         
         int net_phone = connect_to_service(SERVICE_NETWORKING);
-        if (ERROR_OCCURRED(ipc_call_sync_0_0(net_phone, NET_NET_STARTUP))) {
-                fprintf(stderr, "%s: Startup error %d\n", NAME, ERROR_CODE);
-                return ERROR_CODE;
+        rc = ipc_call_sync_0_0(net_phone, NET_NET_STARTUP);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: Startup error %d\n", NAME, rc);
+                return rc;
         }