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

Changeset 3da12d74 in mainline for uspace/app/netstart/netstart.c


Ignore:
Timestamp:
2010-11-07T13:41:35Z (11 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
9ce7eb5, 9fd39d6, b40bfac
Parents:
1712f87 (diff), 69e0d6d (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 my dev/netcleanup. Remove use of ERROR_… macros from app/net* and some cstyle cleanup.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/netstart/netstart.c

    r1712f87 r3da12d74  
    4141#include <task.h>
    4242#include <str_error.h>
    43 #include <err.h>
    4443#include <ipc/ipc.h>
    4544#include <ipc/services.h>
     
    7271int main(int argc, char *argv[])
    7372{
    74         ERROR_DECLARE;
     73        int rc;
    7574       
    7675        if (!spawn("networking service", "/srv/net"))
     
    8079       
    8180        int net_phone = connect_to_service(SERVICE_NETWORKING);
    82         if (ERROR_OCCURRED(ipc_call_sync_0_0(net_phone, NET_NET_STARTUP))) {
    83                 fprintf(stderr, "%s: Startup error %d\n", NAME, ERROR_CODE);
    84                 return ERROR_CODE;
     81        rc = ipc_call_sync_0_0(net_phone, NET_NET_STARTUP);
     82        if (rc != EOK) {
     83                fprintf(stderr, "%s: Startup error %d\n", NAME, rc);
     84                return rc;
    8585        }
    8686       
Note: See TracChangeset for help on using the changeset viewer.