Changeset b40bfac in mainline for uspace/srv/net/nil/nildummy/nildummy_module.c

Timestamp:

2010-11-08T07:13:25Z (14 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/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 <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());
         
-        ipcarg_t phonehash;
-        if (ERROR_OCCURRED(nil_initialize(net_phone)) ||
-            ERROR_OCCURRED(REGISTER_ME(SERVICE_NILDUMMY, &phonehash))) {
-                pm_destroy();
-                return ERROR_CODE;
-        }
+        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;
         
         async_manager();
-        
+
+out:
         pm_destroy();
-        return EOK;
+        return rc;
 }