Changeset 7e752b2 in mainline for uspace/lib

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:

uspace/lib

Files:

• block/libblock.c (modified) (2 diffs)
• c/generic/stacktrace.c (modified) (1 diff)
• drv/generic/driver.c (modified) (4 diffs)

uspace/lib/block/libblock.c

@@ -816 +816 @@
             UPPER32(ba), cnt);
         if (rc != EOK) {
-                printf("Error %d reading %d blocks starting at block %" PRIuOFF64
-                    " from device handle %d\n", rc, cnt, ba,
+                printf("Error %d reading %zu blocks starting at block %" PRIuOFF64
+                    " from device handle %" PRIun "\n", rc, cnt, ba,
                     devcon->devmap_handle);
 #ifndef NDEBUG
@@ -843 +843 @@
             UPPER32(ba), cnt);
         if (rc != EOK) {
-                printf("Error %d writing %d blocks starting at block %" PRIuOFF64
-                    " to device handle %d\n", rc, cnt, ba, devcon->devmap_handle);
+                printf("Error %d writing %zu blocks starting at block %" PRIuOFF64
+                    " to device handle %" PRIun "\n", rc, cnt, ba, devcon->devmap_handle);
 #ifndef NDEBUG
                 stacktrace_print();

uspace/lib/c/generic/stacktrace.c

@@ -50 +50 @@
 
         while (stacktrace_fp_valid(&st, fp)) {
-                printf("%p: %p()\n", fp, pc);
+                printf("%p: %p()\n", (void *) fp, (void *) pc);
                 (void) stacktrace_ra_get(&st, fp, &pc);
                 (void) stacktrace_fp_prev(&st, fp, &nfp);

uspace/lib/drv/generic/driver.c

@@ -48 +48 @@
 #include <ctype.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include <ipc/driver.h>
@@ -173 +174 @@
         res = driver->driver_ops->add_device(dev);
         if (0 == res) {
-                printf("%s: new device with handle = %x was added.\n",
+                printf("%s: new device with handle=%" PRIun " was added.\n",
                     driver->name, dev_handle);
         } else {
-                printf("%s: failed to add a new device with handle = %d.\n",
+                printf("%s: failed to add a new device with handle = %" PRIun ".\n",
                     driver->name, dev_handle);
                 remove_from_devices_list(dev);
@@ -225 +226 @@
         if (dev == NULL) {
                 printf("%s: driver_connection_gen error - no device with handle"
-                    " %x was found.\n", driver->name, handle);
+                    " %" PRIun " was found.\n", driver->name, handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -289 +290 @@
                                 printf("%s: driver_connection_gen error - ",
                                     driver->name);
-                                printf("device with handle %d has no interface "
+                                printf("device with handle %" PRIun " has no interface "
                                     "with id %d.\n", handle, iface_idx);
                                 ipc_answer_0(callid, ENOTSUP);