Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-11-06T00:19:13Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/nil/nildummy/nildummy_module.c

    r0485135 r0b81cad0  
    3838#include <async.h>
    3939#include <stdio.h>
    40 #include <err.h>
     40#include <errno.h>
    4141
    4242#include <ipc/ipc.h>
     
    5252int nil_module_start_standalone(async_client_conn_t client_connection)
    5353{
    54         ERROR_DECLARE;
     54        ipcarg_t phonehash;
     55        int rc;
    5556       
    5657        async_set_client_connection(client_connection);
    5758        int net_phone = net_connect_module();
    58         ERROR_PROPAGATE(pm_init());
    5959       
    60         ipcarg_t phonehash;
    61         if (ERROR_OCCURRED(nil_initialize(net_phone)) ||
    62             ERROR_OCCURRED(REGISTER_ME(SERVICE_NILDUMMY, &phonehash))) {
    63                 pm_destroy();
    64                 return ERROR_CODE;
    65         }
     60        rc = pm_init();
     61        if (rc != EOK)
     62                return rc;
     63       
     64       
     65        rc = nil_initialize(net_phone);
     66        if (rc != EOK)
     67                goto out;
     68       
     69        rc = REGISTER_ME(SERVICE_NILDUMMY, &phonehash);
     70        if (rc != EOK)
     71                goto out;
    6672       
    6773        async_manager();
    68        
     74
     75out:
    6976        pm_destroy();
    70         return EOK;
     77        return rc;
    7178}
    7279
Note: See TracChangeset for help on using the changeset viewer.