Changeset 25eec4e in mainline for kernel/generic/src/console/kconsole.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• kernel/generic/src/console/kconsole.c (modified) (2 diffs)

kernel/generic/src/console/kconsole.c

@@ -524 +524 @@
                 /* It's a number - convert it */
                 uint64_t value;
-                int rc = str_uint64_t(text, NULL, 0, true, &value);
+                char *end;
+                int rc = str_uint64_t(text, &end, 0, false, &value);
+                if (end != text + len)
+                        rc = EINVAL;
                 switch (rc) {
                 case EINVAL:
-                        printf("Invalid number.\n");
+                        printf("Invalid number '%s'.\n", text);
                         return false;
                 case EOVERFLOW:
-                        printf("Integer overflow.\n");
+                        printf("Integer overflow in '%s'.\n", text);
                         return false;
                 case EOK:
@@ -538 +541 @@
                         break;
                 default:
-                        printf("Unknown error.\n");
+                        printf("Unknown error parsing '%s'.\n", text);
                         return false;
                 }