Changeset 93a3348 in mainline

Timestamp:

2008-06-03T14:48:07Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8ed4014

Parents:

2b8b0ca

Message:

proper printf formatting, remove non-standard 'z' modifier

Location:

kernel/generic/src

Files:

• adt/btree.c (modified) (6 diffs)
• printf/printf_core.c (modified) (11 diffs)
• printf/vprintf.c (modified) (1 diff)

kernel/generic/src/adt/btree.c

@@ -125 +125 @@
         if (!lnode) {
                 if (btree_search(t, key, &lnode)) {
-                        panic("B-tree %p already contains key %d\n", t, key);
+                        panic("B-tree %p already contains key %" PRIu64 "\n", t, key);
                 }
         }
@@ -225 +225 @@
         if (!lnode) {
                 if (!btree_search(t, key, &lnode)) {
-                        panic("B-tree %p does not contain key %d\n", t, key);
+                        panic("B-tree %p does not contain key %" PRIu64 "\n", t, key);
                 }
         }
@@ -525 +525 @@
                 }
         }
-        panic("node %p does not contain key %d\n", node, key);
+        panic("node %p does not contain key %" PRIu64 "\n", node, key);
 }
 
@@ -552 +552 @@
                 }
         }
-        panic("node %p does not contain key %d\n", node, key);
+        panic("node %p does not contain key %" PRIu64 "\n", node, key);
 }
 
@@ -971 +971 @@
                 printf("(");
                 for (i = 0; i < node->keys; i++) {
-                        printf("%llu%s", node->key[i], i < node->keys - 1 ? "," : "");
+                        printf("%" PRIu64 "%s", node->key[i], i < node->keys - 1 ? "," : "");
                         if (node->depth && node->subtree[i]) {
                                 list_append(&node->subtree[i]->bfs_link, &head);
@@ -993 +993 @@
                 printf("(");
                 for (i = 0; i < node->keys; i++)
-                        printf("%llu%s", node->key[i], i < node->keys - 1 ? "," : "");
+                        printf("%" PRIu64 "%s", node->key[i], i < node->keys - 1 ? "," : "");
                 printf(")");
         }

kernel/generic/src/printf/printf_core.c

@@ -76 +76 @@
         PrintfQualifierLong,
         PrintfQualifierLongLong,
-        PrintfQualifierNative,
         PrintfQualifierPointer
 } qualifier_t;
@@ -433 +432 @@
  *      - "l"   Signed or unsigned long int.@n
  *      - "ll"  Signed or unsigned long long int.@n
- *      - "z"   unative_t (non-standard extension).@n
  * 
  * 
@@ -487 +485 @@
         while ((c = fmt[i])) {
                 /* control character */
-                if (c == '%' ) { 
+                if (c == '%') { 
                         /* print common characters if any processed */  
                         if (i > j) {
@@ -537 +535 @@
                                 /* get width value from argument list */
                                 i++;
-                                width = (int)va_arg(ap, int);
+                                width = (int) va_arg(ap, int);
                                 if (width < 0) {
                                         /* negative width sets '-' flag */
@@ -560 +558 @@
                                          */
                                         i++;
-                                        precision = (int)va_arg(ap, int);
+                                        precision = (int) va_arg(ap, int);
                                         if (precision < 0) {
                                                 /* ignore negative precision */
@@ -585 +583 @@
                                         qualifier = PrintfQualifierLongLong;
                                 }
-                                break;
-                        case 'z':       /* unative_t */
-                                qualifier = PrintfQualifierNative;
                                 break;
                         default:
@@ -628 +623 @@
                          */
                         case 'P': /* pointer */
-                                flags |= __PRINTF_FLAG_BIGCHARS;
+                                flags |= __PRINTF_FLAG_BIGCHARS;
                         case 'p':
                                 flags |= __PRINTF_FLAG_PREFIX;
@@ -671 +666 @@
                         case PrintfQualifierByte:
                                 size = sizeof(unsigned char);
-                                number = (uint64_t)va_arg(ap, unsigned int);
+                                number = (uint64_t) va_arg(ap, unsigned int);
                                 break;
                         case PrintfQualifierShort:
                                 size = sizeof(unsigned short);
-                                number = (uint64_t)va_arg(ap, unsigned int);
+                                number = (uint64_t) va_arg(ap, unsigned int);
                                 break;
                         case PrintfQualifierInt:
                                 size = sizeof(unsigned int);
-                                number = (uint64_t)va_arg(ap, unsigned int);
+                                number = (uint64_t) va_arg(ap, unsigned int);
                                 break;
                         case PrintfQualifierLong:
                                 size = sizeof(unsigned long);
-                                number = (uint64_t)va_arg(ap, unsigned long);
+                                number = (uint64_t) va_arg(ap, unsigned long);
                                 break;
                         case PrintfQualifierLongLong:
                                 size = sizeof(unsigned long long);
-                                number = (uint64_t)va_arg(ap,
-                                    unsigned long long);
+                                number = (uint64_t) va_arg(ap, unsigned long long);
                                 break;
                         case PrintfQualifierPointer:
                                 size = sizeof(void *);
-                                number = (uint64_t)(unsigned long)va_arg(ap,
-                                    void *);
-                                break;
-                        case PrintfQualifierNative:
-                                size = sizeof(unative_t);
-                                number = (uint64_t)va_arg(ap, unative_t);
+                                number = (uint64_t) (unsigned long) va_arg(ap, void *);
                                 break;
                         default: /* Unknown qualifier */
@@ -709 +698 @@
                                 
                                         if (size == sizeof(uint64_t)) {
-                                                number = -((int64_t)number);
+                                                number = -((int64_t) number);
                                         } else {
                                                 number = ~number;
@@ -735 +724 @@
         
         if (i > j) {
-                if ((retval = printf_putnchars(&fmt[j], (unative_t)(i - j),
+                if ((retval = printf_putnchars(&fmt[j], (unative_t) (i - j),
                     ps)) < 0) { /* error */
                         counter = -counter;
@@ -745 +734 @@
 
 out:
-        
         return counter;
 }

kernel/generic/src/printf/vprintf.c

@@ -38 +38 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
+#include <arch/types.h>
+#include <typedefs.h>
 
 SPINLOCK_INITIALIZE(printf_lock);                       /**< vprintf spinlock */