Changeset 8ed4014 in mainline

Timestamp:

2008-06-03T14:49:03Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

49eec93

Parents:

93a3348

Message:

proper printf formatting

Location:

kernel/generic/src

Files:

• debug/symtab.c (modified) (2 diffs)
• synch/rwlock.c (modified) (1 diff)
• synch/spinlock.c (modified) (2 diffs)

kernel/generic/src/debug/symtab.c

@@ -40 +40 @@
 #include <func.h>
 #include <print.h>
+#include <arch/types.h>
+#include <typedefs.h>
 
 /** Return entry that seems most likely to correspond to argument.
@@ -140 +142 @@
                 addr =  uint64_t_le2host(symbol_table[i].address_le);
                 realname = symbol_table[i].symbol_name;
-                printf("%.*p: %s\n", sizeof(uintptr_t) * 2, addr, realname);
+                printf("%p: %s\n", addr, realname);
                 i++;
         }

kernel/generic/src/synch/rwlock.c

@@ -232 +232 @@
                         break;
                 case ESYNCH_OK_ATOMIC:
-                        panic("_mutex_lock_timeout()==ESYNCH_OK_ATOMIC\n");
+                        panic("_mutex_lock_timeout() == ESYNCH_OK_ATOMIC\n");
                         break;
                 default:

kernel/generic/src/synch/spinlock.c

@@ -107 +107 @@
 #endif
                 if (i++ > DEADLOCK_THRESHOLD) {
-                        printf("cpu%d: looping on spinlock %.*p:%s, "
-                            "caller=%.*p", CPU->id, sizeof(uintptr_t) * 2, sl,
-                            sl->name, sizeof(uintptr_t) * 2, CALLER);
+                        printf("cpu%u: looping on spinlock %" PRIp ":%s, caller=%" PRIp,
+                                CPU->id, sl, sl->name, CALLER);
                         symbol = get_symtab_entry(CALLER);
                         if (symbol)
@@ -120 +119 @@
 
         if (deadlock_reported)
-                printf("cpu%d: not deadlocked\n", CPU->id);
+                printf("cpu%u: not deadlocked\n", CPU->id);
 
         /*