Changeset 10b229fa in mainline


Ignore:
Timestamp:
2010-11-03T21:10:12Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4ef32e0c
Parents:
5e9e8b7
Message:

Get rid of more of the ERROR_CODE madness in nildummy.

File:
1 edited

Legend:

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

    r5e9e8b7 r10b229fa  
    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))) {
     60        rc = pm_init();
     61        if (rc != EOK)
     62                return rc;
     63       
     64       
     65        rc = nil_initialize(net_phone);
     66        if (rc != EOK) {
    6367                pm_destroy();
    64                 return ERROR_CODE;
     68                return rc;
     69        }
     70       
     71        rc = REGISTER_ME(SERVICE_NILDUMMY, &phonehash);
     72        if (rc != EOK) {
     73                pm_destroy();
     74                return rc;
    6575        }
    6676       
Note: See TracChangeset for help on using the changeset viewer.