Module Name: src
Committed By: sborrill
Date: Fri Apr 3 16:23:41 UTC 2009
Modified Files:
src/sys/dev/raidframe: rf_disks.c rf_netbsdkintf.c
Log Message:
Switch various printfs from %ld and %d to PRIu64, etc. to be more consistent
about types (for instance uint32_t was being printed with %d).
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/raidframe/rf_disks.c
cvs rdiff -u -r1.259 -r1.260 src/sys/dev/raidframe/rf_netbsdkintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_disks.c
diff -u src/sys/dev/raidframe/rf_disks.c:1.70 src/sys/dev/raidframe/rf_disks.c:1.71
--- src/sys/dev/raidframe/rf_disks.c:1.70 Mon Apr 28 20:23:56 2008
+++ src/sys/dev/raidframe/rf_disks.c Fri Apr 3 16:23:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.70 2008/04/28 20:23:56 martin Exp $ */
+/* $NetBSD: rf_disks.c,v 1.71 2009/04/03 16:23:41 sborrill Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -60,7 +60,7 @@
***************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.70 2008/04/28 20:23:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.71 2009/04/03 16:23:41 sborrill Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -143,9 +143,9 @@
} else {
if (disks[c].numBlocks < min_numblks)
min_numblks = disks[c].numBlocks;
- DPRINTF6("Disk at col %d: dev %s numBlocks %ld blockSize %d (%ld MB)\n",
+ DPRINTF6("Disk at col %d: dev %s numBlocks %" PRIu64 " blockSize %d (%ld MB)\n",
c, disks[c].devname,
- (long int) disks[c].numBlocks,
+ disks[c].numBlocks,
disks[c].blockSize,
(long int) disks[c].numBlocks *
disks[c].blockSize / 1024 / 1024);
@@ -253,9 +253,9 @@
} else {
disks[i].status = rf_ds_spare; /* change status to
* spare */
- DPRINTF6("Spare Disk %d: dev %s numBlocks %ld blockSize %d (%ld MB)\n", i,
+ DPRINTF6("Spare Disk %d: dev %s numBlocks %" PRIu64 " blockSize %d (%ld MB)\n", i,
disks[i].devname,
- (long int) disks[i].numBlocks, disks[i].blockSize,
+ disks[i].numBlocks, disks[i].blockSize,
(long int) disks[i].numBlocks *
disks[i].blockSize / 1024 / 1024);
}
@@ -271,17 +271,17 @@
goto fail;
}
if (disks[i].numBlocks < raidPtr->sectorsPerDisk) {
- RF_ERRORMSG3("Spare disk %s (%d blocks) is too small to serve as a spare (need %ld blocks)\n",
+ RF_ERRORMSG3("Spare disk %s (%d blocks) is too small to serve as a spare (need %" PRIu64 " blocks)\n",
disks[i].devname, disks[i].blockSize,
- (long int) raidPtr->sectorsPerDisk);
+ raidPtr->sectorsPerDisk);
ret = EINVAL;
goto fail;
} else
if (disks[i].numBlocks > raidPtr->sectorsPerDisk) {
- RF_ERRORMSG3("Warning: truncating spare disk %s to %ld blocks (from %ld)\n",
+ RF_ERRORMSG3("Warning: truncating spare disk %s to %" PRIu64 " blocks (from %" PRIu64 ")\n",
disks[i].devname,
- (long int) raidPtr->sectorsPerDisk,
- (long int) disks[i].numBlocks);
+ raidPtr->sectorsPerDisk,
+ disks[i].numBlocks);
disks[i].numBlocks = raidPtr->sectorsPerDisk;
}
@@ -980,9 +980,10 @@
goto fail;
} else {
disks[spare_number].status = rf_ds_spare;
- DPRINTF6("Spare Disk %d: dev %s numBlocks %ld blockSize %d (%ld MB)\n", spare_number,
+ DPRINTF6("Spare Disk %d: dev %s numBlocks %" PRIu64 " blockSize %d (%ld MB)\n",
+ spare_number,
disks[spare_number].devname,
- (long int) disks[spare_number].numBlocks,
+ disks[spare_number].numBlocks,
disks[spare_number].blockSize,
(long int) disks[spare_number].numBlocks *
disks[spare_number].blockSize / 1024 / 1024);
@@ -998,20 +999,20 @@
goto fail;
}
if (disks[spare_number].numBlocks < raidPtr->sectorsPerDisk) {
- RF_ERRORMSG3("Spare disk %s (%d blocks) is too small to serve as a spare (need %ld blocks)\n",
+ RF_ERRORMSG3("Spare disk %s (%d blocks) is too small to serve as a spare (need %" PRIu64 " blocks)\n",
disks[spare_number].devname,
disks[spare_number].blockSize,
- (long int) raidPtr->sectorsPerDisk);
+ raidPtr->sectorsPerDisk);
rf_close_component(raidPtr, raidPtr->raid_cinfo[raidPtr->numCol+spare_number].ci_vp, 0);
ret = EINVAL;
goto fail;
} else {
if (disks[spare_number].numBlocks >
raidPtr->sectorsPerDisk) {
- RF_ERRORMSG3("Warning: truncating spare disk %s to %ld blocks (from %ld)\n",
+ RF_ERRORMSG3("Warning: truncating spare disk %s to %" PRIu64 " blocks (from %" PRIu64 ")\n",
disks[spare_number].devname,
- (long int) raidPtr->sectorsPerDisk,
- (long int) disks[spare_number].numBlocks);
+ raidPtr->sectorsPerDisk,
+ disks[spare_number].numBlocks);
disks[spare_number].numBlocks = raidPtr->sectorsPerDisk;
}
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.259 src/sys/dev/raidframe/rf_netbsdkintf.c:1.260
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.259 Sun Mar 15 17:17:23 2009
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Fri Apr 3 16:23:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.259 2009/03/15 17:17:23 cegger Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.260 2009/04/03 16:23:41 sborrill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.259 2009/03/15 17:17:23 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.260 2009/04/03 16:23:41 sborrill Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2308,15 +2308,15 @@
*/
if (lp->d_secperunit != rs->sc_size)
printf("raid%d: WARNING: %s: "
- "total sector size in disklabel (%d) != "
- "the size of raid (%ld)\n", unit, rs->sc_xname,
- lp->d_secperunit, (long) rs->sc_size);
+ "total sector size in disklabel (%" PRIu32 ") != "
+ "the size of raid (%" PRIu64 ")\n", unit, rs->sc_xname,
+ lp->d_secperunit, rs->sc_size);
for (i = 0; i < lp->d_npartitions; i++) {
pp = &lp->d_partitions[i];
if (pp->p_offset + pp->p_size > rs->sc_size)
printf("raid%d: WARNING: %s: end of partition `%c' "
- "exceeds the size of raid (%ld)\n",
- unit, rs->sc_xname, 'a' + i, (long) rs->sc_size);
+ "exceeds the size of raid (%" PRIu64 ")\n",
+ unit, rs->sc_xname, 'a' + i, rs->sc_size);
}
}
