Changeset c47e1a8 in mainline for kernel/generic/src/debug/symtab.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/debug/symtab.c (modified) (4 diffs)

kernel/generic/src/debug/symtab.c

@@ -38 +38 @@
 #include <symtab.h>
 #include <byteorder.h>
-#include <string.h>
+#include <str.h>
 #include <print.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <typedefs.h>
 #include <errno.h>
@@ -54 +54 @@
  *
  */
-int symtab_name_lookup(uintptr_t addr, char **name, uintptr_t *offset)
+int symtab_name_lookup(uintptr_t addr, const char **name, uintptr_t *offset)
 {
 #ifdef CONFIG_SYMTAB
@@ -92 +92 @@
  *
  */
-char *symtab_fmt_name_lookup(uintptr_t addr)
-{
-        char *name;
+const char *symtab_fmt_name_lookup(uintptr_t addr)
+{
+        const char *name;
         int rc = symtab_name_lookup(addr, &name, NULL);
         
@@ -239 +239 @@
                 printf("\n");
                 pos = 0;
-                while ((hint = symtab_search_one(name, &pos))) {
+                while (symtab_search_one(name, &pos)) {
                         printf("%s\n", symbol_table[pos].symbol_name);
                         pos++;