diff options
author | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-05-16 11:47:54 -0500 |
---|---|---|
committer | Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> | 2019-05-16 11:47:54 -0500 |
commit | 5fa3142cdbb67cbb8287b2ec4fc35ee6532b3c6d (patch) | |
tree | 6abb866f965d62c64868a01950e53e0e6c21f06a /bin/dd/conv.c | |
parent | 5aef04248e45a1a0ce74d96e78abd871048369bf (diff) | |
download | userland-5fa3142cdbb67cbb8287b2ec4fc35ee6532b3c6d.tar.gz userland-5fa3142cdbb67cbb8287b2ec4fc35ee6532b3c6d.tar.bz2 userland-5fa3142cdbb67cbb8287b2ec4fc35ee6532b3c6d.tar.xz userland-5fa3142cdbb67cbb8287b2ec4fc35ee6532b3c6d.zip |
bin/dd: make buildable with libbsd
Diffstat (limited to 'bin/dd/conv.c')
-rw-r--r-- | bin/dd/conv.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/bin/dd/conv.c b/bin/dd/conv.c index d4a8a09..4c85c9d 100644 --- a/bin/dd/conv.c +++ b/bin/dd/conv.c @@ -33,15 +33,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -#ifndef lint -#if 0 -static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94"; -#else -__RCSID("$NetBSD: conv.c,v 1.17 2003/08/07 09:05:10 agc Exp $"); -#endif -#endif /* not lint */ - #include <sys/param.h> #include <sys/time.h> @@ -62,8 +53,8 @@ void def(void) { uint64_t cnt; - u_char *inp; - const u_char *t; + uint8_t *inp; + const uint8_t *t; if ((t = ctab) != NULL) for (inp = in.dbp - (cnt = in.dbrcnt); cnt--; ++inp) @@ -119,8 +110,8 @@ block(void) static int intrunc; int ch = 0; /* pacify gcc */ uint64_t cnt, maxlen; - u_char *inp, *outp; - const u_char *t; + uint8_t *inp, *outp; + const uint8_t *t; /* * Record truncation can cross block boundaries. If currently in a @@ -230,8 +221,8 @@ void unblock(void) { uint64_t cnt; - u_char *inp; - const u_char *t; + uint8_t *inp; + const uint8_t *t; /* Translation and case conversion. */ if ((t = ctab) != NULL) @@ -264,7 +255,7 @@ void unblock_close(void) { uint64_t cnt; - u_char *t; + uint8_t *t; if (in.dbcnt) { warnx("%s: short input record", in.name); |