Changeset 0b81cad0 in mainline for uspace/srv/net/il/ip/ip_module.c

Timestamp:

2010-11-06T00:19:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1712f87

Parents:

0485135 (diff), 0578271 (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 lp:~jakub/helenos/net.

File:

• uspace/srv/net/il/ip/ip_module.c (modified) (2 diffs)

uspace/srv/net/il/ip/ip_module.c

@@ -44 +44 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-#include <err.h>
+#include <errno.h>
 
 #include <net/modules.h>
@@ -66 +66 @@
 int il_module_start_standalone(async_client_conn_t client_connection)
 {
-        ERROR_DECLARE;
+        ipcarg_t phonehash;
+        int rc;
         
         async_set_client_connection(client_connection);
         ip_globals.net_phone = net_connect_module();
-        ERROR_PROPAGATE(pm_init());
+
+        rc = pm_init();
+        if (rc != EOK)
+                return rc;
         
-        ipcarg_t phonehash;
-        if (ERROR_OCCURRED(ip_initialize(client_connection)) ||
-            ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))) {
-                pm_destroy();
-                return ERROR_CODE;
-        }
+        rc = ip_initialize(client_connection);
+        if (rc != EOK)
+                goto out;
+        
+        rc = REGISTER_ME(SERVICE_IP, &phonehash);
+        if (rc != EOK)
+                goto out;
         
         async_manager();
-        
+
+out:
         pm_destroy();
-        return EOK;
+        return rc;
 }