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

Ignore:
Timestamp:
2010-11-04T17:21:36Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
Children:
46ae62c
Parents:
08e3ca4
Message:

Get rid of the ERROR_CODE madness in icmp.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/tl/icmp/icmp_module.c

    r08e3ca4 rd8f95529  
    4343#include <async.h>
    4444#include <stdio.h>
    45 #include <err.h>
     45#include <errno.h>
    4646#include <ipc/ipc.h>
    4747#include <ipc/services.h>
     
    5858int tl_module_start_standalone(async_client_conn_t client_connection)
    5959{
    60         ERROR_DECLARE;
    61 
    6260        ipcarg_t phonehash;
     61        int rc;
    6362
    6463        async_set_client_connection(client_connection);
     
    6766                return icmp_globals.net_phone;
    6867
    69         ERROR_PROPAGATE(pm_init());
    70         if (ERROR_OCCURRED(icmp_initialize(client_connection)) ||
    71             ERROR_OCCURRED(REGISTER_ME(SERVICE_ICMP, &phonehash))) {
    72                 pm_destroy();
    73                 return ERROR_CODE;
    74         }
     68        rc = pm_init();
     69        if (rc != EOK)
     70                return rc;
     71       
     72        rc = icmp_initialize(client_connection);
     73        if (rc != EOK)
     74                goto out;
     75
     76        rc = REGISTER_ME(SERVICE_ICMP, &phonehash);
     77        if (rc != EOK)
     78                goto out;
    7579
    7680        async_manager();
    7781
     82out:
    7883        pm_destroy();
    79         return EOK;
     84        return rc;
    8085}
    8186
     
    8994/** @}
    9095 */
    91 
Note: See TracChangeset for help on using the changeset viewer.