diff options
| author | David Hill <dhill@cvs.openbsd.org> | 2006-03-22 18:08:05 +0000 |
|---|---|---|
| committer | David Hill <dhill@cvs.openbsd.org> | 2006-03-22 18:08:05 +0000 |
| commit | afb79f93e400b36d35786c8fb51ca0da349a9ee8 (patch) | |
| tree | 9728f3381d56724828b68357e50e6aa3643c60ee /bin/dd | |
| parent | d28935ed294cb86af04a99e2293beee8c581aeeb (diff) | |
change %u to %zu to correctly print size_t
ok ray@ jaredy@ moritz@
Diffstat (limited to 'bin/dd')
| -rw-r--r-- | bin/dd/args.c | 8 | ||||
| -rw-r--r-- | bin/dd/misc.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/bin/dd/args.c b/bin/dd/args.c index b7dd697a298..e12ef7efddd 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -1,4 +1,4 @@ -/* $OpenBSD: args.c,v 1.15 2005/04/08 01:46:45 jsg Exp $ */ +/* $OpenBSD: args.c,v 1.16 2006/03/22 18:08:04 dhill Exp $ */ /* $NetBSD: args.c,v 1.7 1996/03/01 01:18:58 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: args.c,v 1.15 2005/04/08 01:46:45 jsg Exp $"; +static char rcsid[] = "$OpenBSD: args.c,v 1.16 2006/03/22 18:08:04 dhill Exp $"; #endif #endif /* not lint */ @@ -72,7 +72,7 @@ static size_t get_bsz(char *); static off_t get_off(char *); static const struct arg { - char *name; + const char *name; void (*f)(char *); u_int set, noset; } args[] = { @@ -267,7 +267,7 @@ f_conv(char *arg) #else /* NO_CONV */ static const struct conv { - char *name; + const char *name; u_int set, noset; const u_char *ctab; } clist[] = { diff --git a/bin/dd/misc.c b/bin/dd/misc.c index 2711ad62b23..e94168b2459 100644 --- a/bin/dd/misc.c +++ b/bin/dd/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.14 2005/05/27 04:14:24 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.15 2006/03/22 18:08:04 dhill Exp $ */ /* $NetBSD: misc.c,v 1.4 1995/03/21 09:04:10 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.14 2005/05/27 04:14:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.15 2006/03/22 18:08:04 dhill Exp $"; #endif #endif /* not lint */ @@ -74,21 +74,21 @@ summary(void) /* Use snprintf(3) so that we don't reenter stdio(3). */ (void)snprintf(buf[0], sizeof(buf[0]), - "%u+%u records in\n%u+%u records out\n", + "%zu+%zu records in\n%zu+%zu records out\n", st.in_full, st.in_part, st.out_full, st.out_part); iov[i].iov_base = buf[0]; iov[i++].iov_len = strlen(buf[0]); if (st.swab) { (void)snprintf(buf[1], sizeof(buf[1]), - "%u odd length swab %s\n", + "%zu odd length swab %s\n", st.swab, (st.swab == 1) ? "block" : "blocks"); iov[i].iov_base = buf[1]; iov[i++].iov_len = strlen(buf[1]); } if (st.trunc) { (void)snprintf(buf[2], sizeof(buf[2]), - "%u truncated %s\n", + "%zu truncated %s\n", st.trunc, (st.trunc == 1) ? "block" : "blocks"); iov[i].iov_base = buf[2]; iov[i++].iov_len = strlen(buf[2]); |