Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sbin/disklabel %td is for ptrdiff_t not for off_t



details:   https://anonhg.NetBSD.org/src/rev/99dec8fc5ffc
branches:  trunk
changeset: 786836:99dec8fc5ffc
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 15 00:47:43 2013 +0000

description:
%td is for ptrdiff_t not for off_t

diffstat:

 sbin/disklabel/main.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (55 lines):

diff -r c75612c29470 -r 99dec8fc5ffc sbin/disklabel/main.c
--- a/sbin/disklabel/main.c     Wed May 15 00:35:02 2013 +0000
+++ b/sbin/disklabel/main.c     Wed May 15 00:47:43 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.34 2013/05/13 18:01:08 christos Exp $       */
+/*     $NetBSD: main.c,v 1.35 2013/05/15 00:47:43 christos Exp $       */
 
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
 static char sccsid[] = "@(#)disklabel.c        8.4 (Berkeley) 5/4/95";
 /* from static char sccsid[] = "@(#)disklabel.c        1.2 (Symmetric) 11/28/85"; */
 #else
-__RCSID("$NetBSD: main.c,v 1.34 2013/05/13 18:01:08 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.35 2013/05/15 00:47:43 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -1172,28 +1172,28 @@
                        if (target32toh(disk_lp->d_magic) == DISKMAGIC_REV &&
                            target32toh(disk_lp->d_magic2) == DISKMAGIC_REV)
                                warnx("ignoring %sbyteswapped label"
-                                   " at offset %td from sector %u",
-                                   is_deleted, offset, sector);
+                                   " at offset %jd from sector %u",
+                                   is_deleted, (intmax_t)offset, sector);
                        continue;
                }
                if (target16toh(disk_lp->d_npartitions) > maxpartitions ||
                    dkcksum_target(disk_lp) != 0) {
                        if (verbose > 0)
-                               warnx("corrupt label found at offset %td in "
-                                   "sector %u", offset, sector);
+                               warnx("corrupt label found at offset %jd in "
+                                   "sector %u", (intmax_t)offset, sector);
                        continue;
                }
                if (verbose > 1)
-                       warnx("%slabel found at offset %td from sector %u",
-                           is_deleted, offset, sector);
+                       warnx("%slabel found at offset %jd from sector %u",
+                           is_deleted, (intmax_t)offset, sector);
                if (!read_all)
                        return disk_lp;
 
                /* To print all the labels we have to do it here */
                /* XXX: maybe we should compare them? */
                targettohlabel(&hlp, disk_lp);
-               printf("# %ssector %u offset %td bytes\n",
-                   is_deleted, sector, offset);
+               printf("# %ssector %u offset %jd bytes\n",
+                   is_deleted, sector, (intmax_t)offset);
                if (tflag)
                        makedisktab(stdout, &hlp);
                else {



Home | Main Index | Thread Index | Old Index