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

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

kernel/generic/src/console/kconsole.c

@@ -45 +45 @@
 #include <print.h>
 #include <panic.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 #include <arch.h>
@@ -51 +51 @@
 #include <debug.h>
 #include <func.h>
-#include <string.h>
+#include <str.h>
 #include <macros.h>
 #include <sysinfo/sysinfo.h>
@@ -58 +58 @@
 #include <errno.h>
 #include <putchar.h>
-#include <string.h>
+#include <str.h>
 
 /** Simple kernel console.
@@ -224 +224 @@
                 printf("\n");
                 pos = NULL;
-                while ((hint = cmdtab_search_one(name, &pos))) {
+                while (cmdtab_search_one(name, &pos)) {
                         cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
                         printf("%s (%s)\n", hlp->name, hlp->description);
@@ -455 +455 @@
                         printf("No symbol information available.\n");
                         return false;
-                }
-                
-                if (isaddr)
-                        *result = (unative_t) symaddr;
-                else if (isptr)
-                        *result = **((unative_t **) symaddr);
-                else
-                        *result = *((unative_t *) symaddr);
+                case EOK:
+                        if (isaddr)
+                                *result = (unative_t) symaddr;
+                        else if (isptr)
+                                *result = **((unative_t **) symaddr);
+                        else
+                                *result = *((unative_t *) symaddr);
+                        break;
+                default:
+                        printf("Unknown error.\n");
+                        return false;
+                }
         } else {
                 /* It's a number - convert it */
-                *result = atoi(text);
-                if (isptr)
-                        *result = *((unative_t *) *result);
+                uint64_t value;
+                int rc = str_uint64(text, NULL, 0, true, &value);
+                switch (rc) {
+                case EINVAL:
+                        printf("Invalid number.\n");
+                        return false;
+                case EOVERFLOW:
+                        printf("Integer overflow.\n");
+                        return false;
+                case EOK:
+                        *result = (unative_t) value;
+                        if (isptr)
+                                *result = *((unative_t *) *result);
+                        break;
+                default:
+                        printf("Unknown error.\n");
+                        return false;
+                }
         }
         
@@ -643 +662 @@
  *
  */
-void kconsole(char *prompt, char *msg, bool kcon)
+void kconsole(const char *prompt, const char *msg, bool kcon)
 {
         if (!stdin) {