Changes in uspace/srv/net/nil/nildummy/nildummy_module.c [614d065:08e3ca4] 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 <err.h>
+#include <errno.h>
 
 #include <ipc/ipc.h>
@@ -50 +50 @@
 #include "nildummy.h"
 
-/** Start the dummy nil module.
- *
- * Initialize the client connection serving function, initialize
- * the module, register the module service and start the async
- * manager, processing IPC messages in an infinite loop.
- *
- * @param[in] client_connection The client connection processing
- *                              function. The module skeleton propagates
- *                              its own one.
- *
- * @return EOK on success.
- * @return Other error codes as defined for the pm_init() function.
- * @return Other error codes as defined for the nil_initialize() function.
- * @return Other error codes as defined for the REGISTER_ME() macro function.
- *
- */
 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;
 }
 
-/** Pass the parameters to the module specific nil_message() function.
- *
- * @param[in]  name         Module name.
- * @param[in]  callid       The message identifier.
- * @param[in]  call         The message parameters.
- * @param[out] answer       The message answer parameters.
- * @param[out] answer_count The last parameter for the actual answer
- *                          in the answer parameter.
- *
- * @return EOK on success.
- * @return ENOTSUP if the message is not known.
- * @return Other error codes as defined for each specific
- *          module message function.
- *
- */
-int nil_module_message_standalone(const char *name, ipc_callid_t callid,
+int
+nil_module_message_standalone(const char *name, ipc_callid_t callid,
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {