| /trunk/kernel/generic/src/printf/vprintf.c |
|---|
| 37,6 → 37,8 |
| #include <putchar.h> |
| #include <synch/spinlock.h> |
| #include <arch/asm.h> |
| #include <arch/types.h> |
| #include <typedefs.h> |
| SPINLOCK_INITIALIZE(printf_lock); /**< vprintf spinlock */ |
| /trunk/kernel/generic/src/printf/printf_core.c |
|---|
| 75,7 → 75,6 |
| PrintfQualifierInt, |
| PrintfQualifierLong, |
| PrintfQualifierLongLong, |
| PrintfQualifierNative, |
| PrintfQualifierPointer |
| } qualifier_t; |
| 432,7 → 431,6 |
| * - "" Signed or unsigned int (default value).@n |
| * - "l" Signed or unsigned long int.@n |
| * - "ll" Signed or unsigned long long int.@n |
| * - "z" unative_t (non-standard extension).@n |
| * |
| * |
| * CONVERSION:@n |
| 585,9 → 583,6 |
| qualifier = PrintfQualifierLongLong; |
| } |
| break; |
| case 'z': /* unative_t */ |
| qualifier = PrintfQualifierNative; |
| break; |
| default: |
| /* default type */ |
| qualifier = PrintfQualifierInt; |
| 686,18 → 681,12 |
| 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 *); |
| number = (uint64_t) (unsigned long) va_arg(ap, void *); |
| break; |
| case PrintfQualifierNative: |
| size = sizeof(unative_t); |
| number = (uint64_t)va_arg(ap, unative_t); |
| break; |
| default: /* Unknown qualifier */ |
| counter = -counter; |
| goto out; |
| 744,7 → 733,6 |
| } |
| out: |
| return counter; |
| } |
| /trunk/kernel/generic/src/adt/btree.c |
|---|
| 124,7 → 124,7 |
| lnode = leaf_node; |
| 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); |
| } |
| } |
| 224,7 → 224,7 |
| lnode = leaf_node; |
| 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); |
| } |
| } |
| 524,7 → 524,7 |
| return; |
| } |
| } |
| panic("node %p does not contain key %d\n", node, key); |
| panic("node %p does not contain key %" PRIu64 "\n", node, key); |
| } |
| /** Remove key and its right subtree pointer from B-tree node. |
| 551,7 → 551,7 |
| return; |
| } |
| } |
| panic("node %p does not contain key %d\n", node, key); |
| panic("node %p does not contain key %" PRIu64 "\n", node, key); |
| } |
| /** Split full B-tree node and insert new key-value-right-subtree triplet. |
| 970,7 → 970,7 |
| 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); |
| } |
| 992,7 → 992,7 |
| 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(")"); |
| } |
| printf("\n"); |