Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/il/ip/ip_module.c

    r02314f8 re8199d77  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
    46 #include <errno.h>
     46#include <err.h>
    4747
    4848#include <net/modules.h>
     
    6666int il_module_start_standalone(async_client_conn_t client_connection)
    6767{
    68         ipcarg_t phonehash;
    69         int rc;
     68        ERROR_DECLARE;
    7069       
    7170        async_set_client_connection(client_connection);
    7271        ip_globals.net_phone = net_connect_module();
    73 
    74         rc = pm_init();
    75         if (rc != EOK)
    76                 return rc;
     72        ERROR_PROPAGATE(pm_init());
    7773       
    78         rc = ip_initialize(client_connection);
    79         if (rc != EOK)
    80                 goto out;
    81        
    82         rc = REGISTER_ME(SERVICE_IP, &phonehash);
    83         if (rc != EOK)
    84                 goto out;
     74        ipcarg_t phonehash;
     75        if (ERROR_OCCURRED(ip_initialize(client_connection)) ||
     76            ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))) {
     77                pm_destroy();
     78                return ERROR_CODE;
     79        }
    8580       
    8681        async_manager();
    87 
    88 out:
     82       
    8983        pm_destroy();
    90         return rc;
     84        return EOK;
    9185}
    9286
Note: See TracChangeset for help on using the changeset viewer.