Changes in uspace/srv/net/nil/eth/eth_module.c [6067284:08e3ca4] in mainline

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))) {
-                pm_destroy();
-                return ERROR_CODE;
-        }
+        rc = nil_initialize(net_phone);
+        if (rc != EOK)
+                goto out;
+
+        rc = REGISTER_ME(SERVICE_ETHERNET, &phonehash);
+        if (rc != EOK)
+                goto out;
         
         async_manager();
-        
+
+out:
         pm_destroy();
-        return EOK;
+        return rc;
 }