Changeset c1b0c750 in mainline

Timestamp:

2012-07-29T15:19:46Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

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:

• app/sportdmp/sportdmp.c (modified) (1 diff)
• lib/c/generic/str.c (modified) (1 diff)

uspace/app/sportdmp/sportdmp.c

@@ -65 +65 @@
         
         service_id_t svc_id;
-        int rc = loc_service_get_id(svc_path, &svc_id, IPC_FLAG_BLOCKING);
+        int rc = loc_service_get_id(svc_path, &svc_id, 0);
         if (rc != EOK) {
                 fprintf(stderr, "Cannot find device service %s\n", svc_path);

uspace/lib/c/generic/str.c

@@ -1085 +1085 @@
                 c = (c >= 'a' ? c - 'a' + 10 : (c >= 'A' ? c - 'A' + 10 :
                     (c <= '9' ? c - '0' : 0xff)));
-                if (c > base) {
+                if (c >= base) {
                         break;
                 }