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

Changeset 520acaf in mainline for uspace/srv/loader/main.c


Ignore:
Timestamp:
2012-06-06T21:13:29Z (10 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
5f679702
Parents:
11b9ad7 (diff), 3123d2a (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/loader/main.c

    r11b9ad7 r520acaf  
    450450        int rc = ns_intro(id);
    451451        if (rc != EOK)
    452                 return -1;
     452                return rc;
    453453       
    454454        /* Register at naming service. */
    455         if (service_register(SERVICE_LOAD) != EOK)
    456                 return -2;
     455        rc = service_register(SERVICE_LOAD);
     456        if (rc != EOK)
     457                return rc;
    457458       
    458459        async_manager();
Note: See TracChangeset for help on using the changeset viewer.