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

Changeset c1b0c75 in mainline


Ignore:
Timestamp:
2012-07-29T15:19:46Z (9 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master
Children:
a5b1740
Parents:
8847142 (diff), 13d5639 (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 with mainline

Location:
uspace
Files:
2 edited

Legend:

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

    r8847142 rc1b0c75  
    6565       
    6666        service_id_t svc_id;
    67         int rc = loc_service_get_id(svc_path, &svc_id, IPC_FLAG_BLOCKING);
     67        int rc = loc_service_get_id(svc_path, &svc_id, 0);
    6868        if (rc != EOK) {
    6969                fprintf(stderr, "Cannot find device service %s\n", svc_path);
  • uspace/lib/c/generic/str.c

    r8847142 rc1b0c75  
    10851085                c = (c >= 'a' ? c - 'a' + 10 : (c >= 'A' ? c - 'A' + 10 :
    10861086                    (c <= '9' ? c - '0' : 0xff)));
    1087                 if (c > base) {
     1087                if (c >= base) {
    10881088                        break;
    10891089                }
Note: See TracChangeset for help on using the changeset viewer.