Changeset 4ef32e0c in mainline for uspace/srv/net/nil/eth/eth_module.c

Timestamp:

2010-11-03T21:14:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a852181

Parents:

10b229fa

Message:

Get rid of the ERROR_CODE madness in eth.

File:

• uspace/srv/net/nil/eth/eth_module.c (modified) (2 diffs)

uspace/srv/net/nil/eth/eth_module.c

@@ -40 +40 @@
 #include <async.h>
 #include <stdio.h>
-#include <err.h>
+#include <errno.h>
 
 #include <ipc/ipc.h>
@@ -52 +52 @@
 int nil_module_start_standalone(async_client_conn_t client_connection)
 {
-        ERROR_DECLARE;
+        ipcarg_t phonehash;
+        int rc;
         
         async_set_client_connection(client_connection);
         int net_phone = net_connect_module();
-        ERROR_PROPAGATE(pm_init());
+
+        rc = pm_init();
+        if (rc != EOK)
+                return rc;
         
-        ipcarg_t phonehash;
-        if (ERROR_OCCURRED(nil_initialize(net_phone)) ||
-            ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
+        rc = nil_initialize(net_phone);
+        if (rc != EOK) {
                 pm_destroy();
-                return ERROR_CODE;
+                return rc;
+        }
+
+        rc = REGISTER_ME(SERVICE_ETHERNET, &phonehash);
+        if (rc != EOK) {
+                pm_destroy();
+                return rc;
         }