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

Timestamp:

2010-04-30T23:10:12Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0c42638, bb252ca

Parents:

bcb6f27

Message:

get rid of atoi, use str_uint64

File:

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

kernel/generic/src/console/kconsole.c

@@ -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;
+                }
         }