Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix format warnings

This commit is contained in:
briggs 2000-10-11 04:57:42 +00:00
parent 0abaf0f210
commit 1e8e167a26
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/dump/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.25 1999/10/01 04:35:23 perseant Exp $ */
/* $NetBSD: main.c,v 1.26 2000/10/11 04:57:42 briggs Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
#else
__RCSID("$NetBSD: main.c,v 1.25 1999/10/01 04:35:23 perseant Exp $");
__RCSID("$NetBSD: main.c,v 1.26 2000/10/11 04:57:42 briggs Exp $");
#endif
#endif /* not lint */
@ -414,7 +414,7 @@ main(argc, argv)
dev_bshift = ffs(dev_bsize) - 1;
if (dev_bsize != (1 << dev_bshift))
quit("dev_bsize (%d) is not a power of 2", dev_bsize);
quit("dev_bsize (%ld) is not a power of 2", dev_bsize);
tp_bshift = ffs(TP_BSIZE) - 1;
if (TP_BSIZE != (1 << tp_bshift))
quit("TP_BSIZE (%d) is not a power of 2", TP_BSIZE);
@ -545,9 +545,9 @@ main(argc, argv)
for (i = 0; i < ntrec; i++)
writeheader(maxino - 1);
if (pipeout)
msg("%ld tape blocks\n",iswap32(spcl.c_tapea));
msg("%d tape blocks\n",iswap32(spcl.c_tapea));
else
msg("%ld tape blocks on %d volume%s\n",
msg("%d tape blocks on %d volume%s\n",
iswap32(spcl.c_tapea), iswap32(spcl.c_volume),
(iswap32(spcl.c_volume) == 1) ? "" : "s");
tnow = do_stats();
@ -555,7 +555,7 @@ main(argc, argv)
msg("Date of this level %c dump: %s", level,
spcl.c_date == 0 ? "the epoch\n" : ctime(&date));
msg("Date this dump completed: %s", ctime(&tnow));
msg("Average transfer rate: %ld KB/s\n", xferrate / tapeno);
msg("Average transfer rate: %d KB/s\n", xferrate / tapeno);
putdumptime();
trewind();
broadcast("DUMP IS DONE!\7\7\n");

8
sbin/dump/rcache.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rcache.c,v 1.4 1999/10/01 04:35:23 perseant Exp $ */
/* $NetBSD: rcache.c,v 1.5 2000/10/11 04:57:42 briggs Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -198,7 +198,7 @@ rawread(blkno, buf, size)
disk, blkno, size, cnt);
err:
if (++breaderrors > BREADEMAX) {
msg("More than %d block read errors from %d\n",
msg("More than %d block read errors from %s\n",
BREADEMAX, disk);
broadcast("DUMP IS AILING!\n");
msg("This is an unrecoverable error.\n");
@ -221,12 +221,12 @@ err:
if ((cnt = read(diskfd, buf, (int)dev_bsize)) == dev_bsize)
continue;
if (cnt == -1) {
msg("read error from %s: %s: [sector %d]: count=%d: "
msg("read error from %s: %s: [sector %d]: count=%ld: "
"%s\n", disk, strerror(errno), blkno, dev_bsize,
strerror(errno));
continue;
}
msg("short read error from %s: [sector %d]: count=%d, got=%d\n",
msg("short read error from %s: [sector %d]: count=%ld, got=%d\n",
disk, blkno, dev_bsize, cnt);
}
}

8
sbin/dump/tape.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tape.c,v 1.21 1999/10/01 04:35:23 perseant Exp $ */
/* $NetBSD: tape.c,v 1.22 2000/10/11 04:57:42 briggs Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95";
#else
__RCSID("$NetBSD: tape.c,v 1.21 1999/10/01 04:35:23 perseant Exp $");
__RCSID("$NetBSD: tape.c,v 1.22 2000/10/11 04:57:42 briggs Exp $");
#endif
#endif /* not lint */
@ -227,7 +227,7 @@ tperror(signo)
quit("Cannot recover\n");
/* NOTREACHED */
}
msg("write error %d blocks into volume %d\n", blocksthisvol, tapeno);
msg("write error %ld blocks into volume %d\n", blocksthisvol, tapeno);
broadcast("DUMP WRITE ERROR!\n");
if (!query("Do you want to restart?"))
dumpabort(0);
@ -262,7 +262,7 @@ do_stats()
blocks = iswap32(spcl.c_tapea) - tapea_volume;
msg("Volume %d completed at: %s", tapeno, ctime(&tnow));
if (ttaken > 0) {
msg("Volume %d took %d:%02d:%02d\n", tapeno,
msg("Volume %d took %ld:%02ld:%02ld\n", tapeno,
ttaken / 3600, (ttaken % 3600) / 60, ttaken % 60);
msg("Volume %d transfer rate: %ld KB/s\n", tapeno,
blocks / ttaken);