Changes in uspace/srv/net/tl/icmp/icmp_module.c [d8f95529:edc5a985] in mainline

File:

• uspace/srv/net/tl/icmp/icmp_module.c (modified) (4 diffs)

uspace/srv/net/tl/icmp/icmp_module.c

@@ -43 +43 @@
 #include <async.h>
 #include <stdio.h>
-#include <errno.h>
+#include <err.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
@@ -58 +58 @@
 int tl_module_start_standalone(async_client_conn_t client_connection)
 {
+        ERROR_DECLARE;
+
         ipcarg_t phonehash;
-        int rc;
 
         async_set_client_connection(client_connection);
@@ -66 +67 @@
                 return icmp_globals.net_phone;
 
-        rc = pm_init();
-        if (rc != EOK)
-                return rc;
-        
-        rc = icmp_initialize(client_connection);
-        if (rc != EOK)
-                goto out;
-
-        rc = REGISTER_ME(SERVICE_ICMP, &phonehash);
-        if (rc != EOK)
-                goto out;
+        ERROR_PROPAGATE(pm_init());
+        if (ERROR_OCCURRED(icmp_initialize(client_connection)) ||
+            ERROR_OCCURRED(REGISTER_ME(SERVICE_ICMP, &phonehash))) {
+                pm_destroy();
+                return ERROR_CODE;
+        }
 
         async_manager();
 
-out:
         pm_destroy();
-        return rc;
+        return EOK;
 }
 
@@ -94 +89 @@
 /** @}
  */
+