Changeset 93a3348 in mainline for kernel/generic/src/adt/btree.c

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

File:

• kernel/generic/src/adt/btree.c (modified) (6 diffs)

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(")");
         }