Changeset 6514d1f in mainline for kernel/generic/src/sysinfo/stats.c

Timestamp:

2012-03-24T20:01:34Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

30ac3c3

Parents:

a4419e7 (diff), 059a8e4 (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

File:

• kernel/generic/src/sysinfo/stats.c (modified) (3 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -474 +474 @@
         /* Parse the task ID */
         task_id_t task_id;
-        if (str_uint64(name, NULL, 0, true, &task_id) != EOK)
+        if (str_uint64_t(name, NULL, 0, true, &task_id) != EOK)
                 return ret;
         
@@ -545 +545 @@
         /* Parse the thread ID */
         thread_id_t thread_id;
-        if (str_uint64(name, NULL, 0, true, &thread_id) != EOK)
+        if (str_uint64_t(name, NULL, 0, true, &thread_id) != EOK)
                 return ret;
         
@@ -662 +662 @@
         /* Parse the exception number */
         uint64_t excn;
-        if (str_uint64(name, NULL, 0, true, &excn) != EOK)
+        if (str_uint64_t(name, NULL, 0, true, &excn) != EOK)
                 return ret;