Changeset 3da12d74 in mainline for uspace/app/netstart/netstart.c

Timestamp:

2010-11-07T13:41:35Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9ce7eb5, 9fd39d6, b40bfac

Parents:

1712f87 (diff), 69e0d6d (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 from my dev/netcleanup. Remove use of ERROR_… macros from app/net* and some cstyle cleanup.

File:

• uspace/app/netstart/netstart.c (modified) (3 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>
@@ -72 +71 @@
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
+        int rc;
         
         if (!spawn("networking service", "/srv/net"))
@@ -80 +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;
         }