[src/netbsd-1-4]: src/sbin/dump Pull up revision 1.26 (requested by he):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/12527d505084
branches:  netbsd-1-4
changeset: 471000:12527d505084
user:      he <he%NetBSD.org@localhost>
date:      Wed Oct 11 18:39:04 2000 +0000

description:
Pull up revision 1.26 (requested by he):
  Format string cleanup.

diffstat:

 sbin/dump/main.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 9fff8585a758 -r 12527d505084 sbin/dump/main.c
--- a/sbin/dump/main.c  Wed Oct 11 18:01:31 2000 +0000
+++ b/sbin/dump/main.c  Wed Oct 11 18:39:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.22 1999/03/23 14:22:59 bouyer Exp $ */
+/*     $NetBSD: main.c,v 1.22.2.1 2000/10/11 18:39:04 he Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.6 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.22 1999/03/23 14:22:59 bouyer Exp $");
+__RCSID("$NetBSD: main.c,v 1.22.2.1 2000/10/11 18:39:04 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -424,7 +424,7 @@
        dev_bsize = sblock->fs_fsize / fsbtodb(sblock, 1);
        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);
@@ -570,9 +570,9 @@
        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();
@@ -580,7 +580,7 @@
        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");