diff options
| author |   henning <henning@openbsd.org> | 2003-11-27 20:13:27 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2003-11-27 20:13:27 +0000 |
| commit | 61906042adec8e76b6144e7fe5f4dc5825871b8c (patch) | |
| tree | 22d39af7461d47d1028b0c2b626c9178d9b85a51 | |
| parent | Reduce iterations so test runs faster. (diff) | |
| download | wireguard-openbsd-61906042adec8e76b6144e7fe5f4dc5825871b8c.tar.xz wireguard-openbsd-61906042adec8e76b6144e7fe5f4dc5825871b8c.zip | |
on behalf of tdeval@:
fix several errnous error messages (hah)
partitially from PR3566
| -rw-r--r-- | sys/dev/raidframe/rf_disks.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c index 73c144e70c3..1e9d36e9c5a 100644 --- a/sys/dev/raidframe/rf_disks.c +++ b/sys/dev/raidframe/rf_disks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_disks.c,v 1.9 2003/04/27 11:22:54 ho Exp $ */ +/* $OpenBSD: rf_disks.c,v 1.10 2003/11/27 20:13:27 henning Exp $ */ /* $NetBSD: rf_disks.c,v 1.31 2000/06/02 01:17:14 oster Exp $ */ /* @@ -297,17 +297,17 @@ rf_ConfigureSpareDisks(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr, 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", - disks[i].devname, disks[i].blockSize, - (long int) raidPtr->sectorsPerDisk); + RF_ERRORMSG3("Spare disk %s (%llu blocks) is too small" + " to serve as a spare (need %llu blocks).\n", + disks[i].devname, disks[i].numBlocks, + raidPtr->sectorsPerDisk); ret = EINVAL; goto fail; } else if (disks[i].numBlocks > raidPtr->sectorsPerDisk) { RF_ERRORMSG2("Warning: truncating spare disk" - " %s to %ld blocks.\n", disks[i].devname, - (long int) raidPtr->sectorsPerDisk); + " %s to %llu blocks.\n", disks[i].devname, + raidPtr->sectorsPerDisk); disks[i].numBlocks = raidPtr->sectorsPerDisk; } @@ -1110,18 +1110,18 @@ rf_add_hot_spare(RF_Raid_t *raidPtr, RF_SingleComponent_t *sparePtr) 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", - disks[spare_number].devname, disks[spare_number].blockSize, - (long int) raidPtr->sectorsPerDisk); + RF_ERRORMSG3("Spare disk %s (%llu blocks) is too small to serve" + " as a spare (need %llu blocks).\n", + disks[spare_number].devname, disks[spare_number].numBlocks, + raidPtr->sectorsPerDisk); ret = EINVAL; goto fail; } else { if (disks[spare_number].numBlocks > raidPtr->sectorsPerDisk) { - RF_ERRORMSG2("Warning: truncating spare disk %s to %ld" + RF_ERRORMSG2("Warning: truncating spare disk %s to %llu" " blocks.\n", disks[spare_number].devname, - (long int) raidPtr->sectorsPerDisk); + raidPtr->sectorsPerDisk); disks[spare_number].numBlocks = raidPtr->sectorsPerDisk; } |