Changeset 7e752b2 in mainline for uspace/srv/bd

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/srv/bd

Files:

• ata_bd/ata_bd.c (modified) (2 diffs)
• part/guid_part/guid_part.c (modified) (1 diff)
• part/mbr_part/mbr_part.c (modified) (1 diff)
• rd/rd.c (modified) (1 diff)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -113 +113 @@
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address %p/%p\n", ctl_physical, cmd_physical);
+        printf("I/O address %p/%p\n", (void *) ctl_physical,
+            (void *) cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -181 +182 @@
         }
 
-        printf(" %" PRIu64 " blocks", d->blocks, d->blocks / (2 * 1024));
+        printf(" %" PRIu64 " blocks", d->blocks);
 
         mbytes = d->blocks / (2 * 1024);

uspace/srv/bd/part/guid_part/guid_part.c

@@ -155 +155 @@
 
         if (block_size < 512 || (block_size % 512) != 0) {
-                printf(NAME ": invalid block size %d.\n");
+                printf(NAME ": invalid block size %zu.\n", block_size);
                 return ENOTSUP;
         }

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -206 +206 @@
 
         if (block_size < 512 || (block_size % 512) != 0) {
-                printf(NAME ": invalid block size %d.\n");
+                printf(NAME ": invalid block size %zu.\n", block_size);
                 return ENOTSUP;
         }

uspace/srv/bd/rd/rd.c

@@ -230 +230 @@
         }
         
-        printf("%s: Found RAM disk at %p, %d bytes\n", NAME, rd_ph_addr, rd_size);
+        printf("%s: Found RAM disk at %p, %zu bytes\n", NAME,
+            (void *) rd_ph_addr, rd_size);
         
         int rc = devmap_driver_register(NAME, rd_connection);