Changeset c6588ce in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2012-05-05T08:12:17Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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:

• kernel/generic/src/console/cmd.c (modified) (1 diff)

kernel/generic/src/console/cmd.c

@@ -906 +906 @@
                    ((char *) argv->buffer)[0] <= '9') {
                 uint64_t value;
-                rc = str_uint64((char *) argv->buffer, NULL, 0, true, &value);
+                rc = str_uint64_t((char *) argv->buffer, NULL, 0, true, &value);
                 if (rc == EOK)
                         addr = (uintptr_t) value;