diff options
| author | Johan Karlsson <johan@FreeBSD.org> | 2004-07-22 13:14:42 +0000 |
|---|---|---|
| committer | Johan Karlsson <johan@FreeBSD.org> | 2004-07-22 13:14:42 +0000 |
| commit | aae01d2439166bb4eec5d1c06fd1e09b18309c0f (patch) | |
| tree | dc9bf06dc37064adf55d14022440d375ab9479bc /usr.bin/hexdump | |
| parent | 19a7439eddfc8dcf8377ba443567803bf3cdc608 (diff) | |
Notes
Diffstat (limited to 'usr.bin/hexdump')
| -rw-r--r-- | usr.bin/hexdump/Makefile | 1 | ||||
| -rw-r--r-- | usr.bin/hexdump/display.c | 3 | ||||
| -rw-r--r-- | usr.bin/hexdump/odsyntax.c | 4 | ||||
| -rw-r--r-- | usr.bin/hexdump/parse.c | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile index 4cd3cc5dc62f..3252fc9af147 100644 --- a/usr.bin/hexdump/Makefile +++ b/usr.bin/hexdump/Makefile @@ -7,5 +7,6 @@ MAN= hexdump.1 od.1 MLINKS= hexdump.1 hd.1 LINKS= ${BINDIR}/hexdump ${BINDIR}/od LINKS+= ${BINDIR}/hexdump ${BINDIR}/hd +WARNS?= 6 .include <bsd.prog.mk> diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c index c9ba892bbb24..0887f05deb2f 100644 --- a/usr.bin/hexdump/display.c +++ b/usr.bin/hexdump/display.c @@ -68,6 +68,7 @@ display(void) off_t saveaddress; u_char savech, *savebp; + savech = 0; while ((bp = get())) for (fs = fshead, savebp = bp, saveaddress = address; fs; fs = fs->nextfs, bp = savebp, address = saveaddress) @@ -318,7 +319,7 @@ peek(u_char *buf, size_t nbytes) size_t n, nread; int c; - if (length != -1 && nbytes > length) + if (length != -1 && nbytes > (unsigned int)length) nbytes = length; nread = 0; while (nread < nbytes && (c = getchar()) != EOF) { diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c index 19684bffb635..e0f9283bbc22 100644 --- a/usr.bin/hexdump/odsyntax.c +++ b/usr.bin/hexdump/odsyntax.c @@ -193,7 +193,7 @@ odusage(void) static void odoffset(int argc, char ***argvp) { - unsigned char *p, *num, *end; + char *p, *num, *end; int base; /* @@ -246,7 +246,7 @@ odoffset(int argc, char ***argvp) base = 10; } - skip = strtoll(num, (char **)&end, base ? base : 8); + skip = strtoll(num, &end, base ? base : 8); /* if end isn't the same as p, we got a non-octal digit */ if (end != p) { diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c index 7b7f8e777aff..1231a1519ea5 100644 --- a/usr.bin/hexdump/parse.c +++ b/usr.bin/hexdump/parse.c @@ -214,6 +214,9 @@ rewrite(FS *fs) char savech, cs[3]; int nconv, prec; + nextpr = NULL; + prec = 0; + for (fu = fs->nextfu; fu; fu = fu->nextfu) { /* * Break each format unit into print units; each conversion |