Changeset b40bfac in mainline for uspace/app/netstart/netstart.c

Timestamp:

2010-11-08T07:13:25Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63a1e60

Parents:

d70a463 (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 (moved) (moved from uspace/srv/net/netstart/netstart.c ) (5 diffs)

uspace/app/netstart/netstart.c

@@ -32 +32 @@
 
 /** @file
- *
  * Start the networking subsystem.
- * Perform networking self-test if executed
- * with the -s argument.
- *
  */
 
@@ -45 +41 @@
 #include <task.h>
 #include <str_error.h>
-#include <err.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
@@ -52 +47 @@
 #include <net/modules.h>
 
-#include "self_test.h"
-
 /** Start a module.
  *
- * @param[in] desc The module description
- * @param[in] path The module absolute path.
- *
- * @returns true on succesful spanwning
- * @returns false on failure
- *
+ * @param[in] desc      The module description
+ * @param[in] path      The module absolute path.
+ * @returns             True on succesful spanwning.
+ * @returns             False on failure
  */
 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;
         }
@@ -84 +71 @@
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
-        
-        /* Run self-tests */
-        if ((argc > 1) && (str_cmp(argv[1], "-s") == 0))
-                ERROR_PROPAGATE(self_test());
+        int rc;
         
         if (!spawn("networking service", "/srv/net"))
@@ -96 +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;
         }