Changeset 7e752b2 in mainline for kernel/generic/src/main

Timestamp:

2010-11-26T01:33:20Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bf61d3a

Parents:

202f57b

Message:

• correct printf() formatting strings and corresponding arguments
• minor cstyle changes and other small fixes

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (4 diffs)
• main.c (modified) (3 diffs)

kernel/generic/src/main/kinit.c

@@ -129 +129 @@
                  * For each CPU, create its load balancing thread.
                  */
-                size_t i;
+                unsigned int i;
                 
                 for (i = 0; i < config.cpu_count; i++) {
@@ -139 +139 @@
                                 thread_ready(thread);
                         } else
-                                printf("Unable to create kcpulb thread for cpu" PRIs "\n", i);
+                                printf("Unable to create kcpulb thread for cpu%u\n", i);
                 }
         }
@@ -179 +179 @@
         for (i = 0; i < init.cnt; i++) {
                 if (init.tasks[i].addr % FRAME_SIZE) {
-                        printf("init[%" PRIs "].addr is not frame aligned\n", i);
+                        printf("init[%zu].addr is not frame aligned\n", i);
                         programs[i].task = NULL;
                         continue;
@@ -219 +219 @@
                         
                         if (rd != RE_OK)
-                                printf("Init binary %" PRIs " not used (error %d)\n", i, rd);
+                                printf("Init binary %zu not used (error %d)\n", i, rd);
                 }
         }

kernel/generic/src/main/main.c

@@ -183 +183 @@
         version_print();
         
-        LOG("\nconfig.base=%p config.kernel_size=%" PRIs
-            "\nconfig.stack_base=%p config.stack_size=%" PRIs,
+        LOG("\nconfig.base=%p config.kernel_size=%zu"
+            "\nconfig.stack_base=%p config.stack_size=%zu",
             config.base, config.kernel_size, config.stack_base,
             config.stack_size);
@@ -225 +225 @@
         slab_enable_cpucache();
         
-        printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n",
+        printf("Detected %u CPU(s), %" PRIu64 " MiB free memory\n",
             config.cpu_count, SIZE2MB(zones_total_size()));
         
@@ -241 +241 @@
                 size_t i;
                 for (i = 0; i < init.cnt; i++)
-                        LOG("init[%" PRIs "].addr=%p, init[%" PRIs
-                            "].size=%" PRIs, i, init.tasks[i].addr, i,
-                            init.tasks[i].size);
+                        LOG("init[%zu].addr=%p, init[%zu].size=%zu",
+                            i, init.tasks[i].addr, i, init.tasks[i].size);
         } else
                 printf("No init binaries found.\n");