Changeset bbe7848 in mainline for uspace/lib/block/libblock.c

Timestamp:

2010-11-26T14:19:00Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

• uspace/lib/block/libblock.c (modified) (2 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();