Changeset 4ef32e0c in mainline for uspace/srv/net/nil/eth/eth_module.c


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

Get rid of the ERROR_CODE madness in eth.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/nil/eth/eth_module.c

    r10b229fa r4ef32e0c  
    4040#include <async.h>
    4141#include <stdio.h>
    42 #include <err.h>
     42#include <errno.h>
    4343
    4444#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());
     59
     60        rc = pm_init();
     61        if (rc != EOK)
     62                return rc;
    5963       
    60         ipcarg_t phonehash;
    61         if (ERROR_OCCURRED(nil_initialize(net_phone)) ||
    62             ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
     64        rc = nil_initialize(net_phone);
     65        if (rc != EOK) {
    6366                pm_destroy();
    64                 return ERROR_CODE;
     67                return rc;
     68        }
     69
     70        rc = REGISTER_ME(SERVICE_ETHERNET, &phonehash);
     71        if (rc != EOK) {
     72                pm_destroy();
     73                return rc;
    6574        }
    6675       
Note: See TracChangeset for help on using the changeset viewer.