Changes in uspace/srv/net/nil/nildummy/nildummy_module.c [08e3ca4:09d5ec8] in mainline

File:

• uspace/srv/net/nil/nildummy/nildummy_module.c (modified) (2 diffs)

uspace/srv/net/nil/nildummy/nildummy_module.c

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