From fa527ae1f2fc9e44a2e6af5437794e41236e901d Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Sun, 11 Jan 2009 19:55:08 -0500 Subject: [PATCH] WARNS6 cleanup for cksum. Remove (void) casts. Use off_t for offsets instead of an u_int32_t. Clean up #includes. Obtained-from: FreeBSD --- usr.bin/cksum/Makefile | 1 - usr.bin/cksum/cksum.1 | 4 ++-- usr.bin/cksum/cksum.c | 16 ++++++++-------- usr.bin/cksum/crc.c | 25 +++++++++++++++---------- usr.bin/cksum/crc32.c | 27 +++++++++++++++------------ usr.bin/cksum/extern.h | 15 ++++++++------- usr.bin/cksum/print.c | 35 +++++++++++++++++++---------------- usr.bin/cksum/sum1.c | 26 +++++++++++++++----------- usr.bin/cksum/sum2.c | 27 ++++++++++++++++----------- 9 files changed, 98 insertions(+), 78 deletions(-) diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile index 5dd6d17aa3..28b76f7b35 100644 --- a/usr.bin/cksum/Makefile +++ b/usr.bin/cksum/Makefile @@ -5,6 +5,5 @@ PROG= cksum SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c LINKS= ${BINDIR}/cksum ${BINDIR}/sum MLINKS= cksum.1 sum.1 -WARNS?= 2 .include diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1 index 7ae4db5bf2..ca72c2b93f 100644 --- a/usr.bin/cksum/cksum.1 +++ b/usr.bin/cksum/cksum.1 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cksum.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/usr.bin/cksum/cksum.1,v 1.10.2.7 2001/08/16 13:16:43 ru Exp $ +.\" $FreeBSD: src/usr.bin/cksum/cksum.1,v 1.19 2005/01/17 07:44:13 ru Exp $ .\" $DragonFly: src/usr.bin/cksum/cksum.1,v 1.4 2008/05/02 02:05:07 swildner Exp $ .\" .Dd April 28, 1995 @@ -155,7 +155,7 @@ The coefficients of R(x) are considered to be a 32-bit sequence. .Pp The bit sequence is complemented and the result is the CRC. .Ed -.Sh DIAGNOSTICS +.Sh EXIT STATUS .Ex -std cksum sum .Sh SEE ALSO .Xr md5 1 diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c index 355b2269ed..873d369af8 100644 --- a/usr.bin/cksum/cksum.c +++ b/usr.bin/cksum/cksum.c @@ -33,9 +33,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. * @(#)cksum.c 8.2 (Berkeley) 4/28/95 - * $FreeBSD: src/usr.bin/cksum/cksum.c,v 1.11.2.1 2001/07/30 10:16:29 dd Exp $ + * $FreeBSD: src/usr.bin/cksum/cksum.c,v 1.18 2008/05/15 20:04:36 brooks Exp $ * $DragonFly: src/usr.bin/cksum/cksum.c,v 1.6 2005/04/10 20:55:38 drhodus Exp $ */ @@ -55,11 +54,12 @@ static void usage(void); int main(int argc, char **argv) { + uint32_t val; int ch, fd, rval; - u_int32_t len, val; + off_t len; char *fn, *p; - int (*cfncn)(int, u_int32_t *, u_int32_t *); - void (*pfncn)(char *, u_int32_t, u_int32_t); + int (*cfncn)(int, uint32_t *, off_t *); + void (*pfncn)(char *, uint32_t, off_t); if ((p = strrchr(argv[0], '/')) == NULL) p = argv[0]; @@ -115,7 +115,7 @@ main(int argc, char **argv) rval = 1; } else pfncn(fn, val, len); - (void)close(fd); + close(fd); } while (*argv); exit(rval); } @@ -123,7 +123,7 @@ main(int argc, char **argv) static void usage(void) { - (void)fprintf(stderr, "usage: cksum [-o 1 | 2 | 3] [file ...]\n"); - (void)fprintf(stderr, " sum [file ...]\n"); + fprintf(stderr, "usage: cksum [-o 1 | 2 | 3] [file ...]\n"); + fprintf(stderr, " sum [file ...]\n"); exit(1); } diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c index b1a97aa4d1..16d0b04eda 100644 --- a/usr.bin/cksum/crc.c +++ b/usr.bin/cksum/crc.c @@ -34,14 +34,18 @@ * SUCH DAMAGE. * * @(#)crc.c 8.1 (Berkeley) 6/17/93 - * $FreeBSD: src/usr.bin/cksum/crc.c,v 1.4 1999/12/05 20:03:21 charnier Exp $ + * $FreeBSD: src/usr.bin/cksum/crc.c,v 1.8 2003/03/13 23:32:28 robert Exp $ * $DragonFly: src/usr.bin/cksum/crc.c,v 1.4 2005/04/10 20:55:38 drhodus Exp $ */ #include + +#include #include -static const u_int32_t crctab[] = { +#include "extern.h" + +static const uint32_t crctab[] = { 0x0, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, @@ -102,23 +106,24 @@ static const u_int32_t crctab[] = { * locations to store the crc and the number of bytes read. It returns 0 on * success and 1 on failure. Errno is set on failure. */ -u_int32_t crc_total = ~0; /* The crc over a number of files. */ +uint32_t crc_total = ~0; /* The crc over a number of files. */ int -crc(int fd, u_int32_t *cval, u_int32_t *clen) +crc(int fd, uint32_t *cval, off_t *clen) { - u_char *p; + uint32_t lcrc; int nr; - u_int32_t crc, len; + off_t len; + u_char *p; u_char buf[16 * 1024]; #define COMPUTE(var, ch) (var) = (var) << 8 ^ crctab[(var) >> 24 ^ (ch)] - crc = len = 0; + lcrc = len = 0; crc_total = ~crc_total; while ((nr = read(fd, buf, sizeof(buf))) > 0) for (len += nr, p = buf; nr--; ++p) { - COMPUTE(crc, *p); + COMPUTE(lcrc, *p); COMPUTE(crc_total, *p); } if (nr < 0) @@ -128,11 +133,11 @@ crc(int fd, u_int32_t *cval, u_int32_t *clen) /* Include the length of the file. */ for (; len != 0; len >>= 8) { - COMPUTE(crc, len & 0xff); + COMPUTE(lcrc, len & 0xff); COMPUTE(crc_total, len & 0xff); } - *cval = ~crc; + *cval = ~lcrc; crc_total = ~crc_total; return (0); } diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c index b1ecb16e0a..ab5cc9fbee 100644 --- a/usr.bin/cksum/crc32.c +++ b/usr.bin/cksum/crc32.c @@ -10,19 +10,25 @@ * use. An error-free packet will leave 0xDEBB20E3 in the crc. * Spencer Garrett * - * $FreeBSD: src/usr.bin/cksum/crc32.c,v 1.5 1999/12/05 20:03:21 charnier Exp $ + * $FreeBSD: src/usr.bin/cksum/crc32.c,v 1.9 2003/03/13 23:32:28 robert Exp $ * $DragonFly: src/usr.bin/cksum/crc32.c,v 1.4 2005/04/10 20:55:38 drhodus Exp $ */ #include +#include +#include +#include + +#include "extern.h" + #define CRC(crc, ch) (crc = (crc >> 8) ^ crctab[(crc ^ (ch)) & 0xff]) /* generated using the AUTODIN II polynomial * x^32 + x^26 + x^23 + x^22 + x^16 + * x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x^1 + 1 */ -static const u_int32_t crctab[256] = { +static const uint32_t crctab[256] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, @@ -89,31 +95,28 @@ static const u_int32_t crctab[256] = { 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, }; -#include -#include -#include - -u_int32_t crc32_total = 0 ; +uint32_t crc32_total = 0; int -crc32(int fd, u_int32_t *cval, u_int32_t *clen) +crc32(int fd, uint32_t *cval, off_t *clen) { - u_int32_t crc = ~0; + uint32_t lcrc = ~0; + int nr ; + off_t len ; char buf[BUFSIZ], *p ; - int len, nr ; len = 0 ; crc32_total = ~crc32_total ; while ((nr = read(fd, buf, sizeof(buf))) > 0) for (len += nr, p = buf; nr--; ++p) { - CRC(crc, *p) ; + CRC(lcrc, *p) ; CRC(crc32_total, *p) ; } if (nr < 0) return 1 ; *clen = len ; - *cval = ~crc ; + *cval = ~lcrc ; crc32_total = ~crc32_total ; return 0 ; } diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h index 260857921e..970580e035 100644 --- a/usr.bin/cksum/extern.h +++ b/usr.bin/cksum/extern.h @@ -31,17 +31,18 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 + * $FreeBSD: src/usr.bin/cksum/extern.h,v 1.6 2003/03/13 23:32:28 robert Exp $ * $DragonFly: src/usr.bin/cksum/extern.h,v 1.3 2003/11/03 19:31:28 eirikn Exp $ */ #include __BEGIN_DECLS -int crc(int, u_int32_t *, u_int32_t *); -void pcrc(char *, u_int32_t, u_int32_t); -void psum1(char *, u_int32_t, u_int32_t); -void psum2(char *, u_int32_t, u_int32_t); -int csum1(int, u_int32_t *, u_int32_t *); -int csum2(int, u_int32_t *, u_int32_t *); -int crc32(int, u_int32_t *, u_int32_t *); +int crc(int, uint32_t *, off_t *); +void pcrc(char *, uint32_t, off_t); +void psum1(char *, uint32_t, off_t); +void psum2(char *, uint32_t, off_t); +int csum1(int, uint32_t *, off_t *); +int csum2(int, uint32_t *, off_t *); +int crc32(int, uint32_t *, off_t *); __END_DECLS diff --git a/usr.bin/cksum/print.c b/usr.bin/cksum/print.c index 51b8bb165c..d1bd6e09f8 100644 --- a/usr.bin/cksum/print.c +++ b/usr.bin/cksum/print.c @@ -31,37 +31,40 @@ * SUCH DAMAGE. * * @(#)print.c 8.1 (Berkeley) 6/6/93 - * $FreeBSD: src/usr.bin/cksum/print.c,v 1.4 1999/12/05 20:03:22 charnier Exp $ + * $FreeBSD: src/usr.bin/cksum/print.c,v 1.7 2003/03/13 23:32:28 robert Exp $ * $DragonFly: src/usr.bin/cksum/print.c,v 1.3 2003/10/02 17:42:26 hmp Exp $ */ #include + #include +#include + #include "extern.h" void -pcrc(char *fn, u_int32_t val, u_int32_t len) +pcrc(char *fn, uint32_t val, off_t len) { - (void)printf("%lu %lu", (u_long) val, (u_long) len); - if (fn) - (void)printf(" %s", fn); - (void)printf("\n"); + printf("%lu %jd", (u_long)val, (intmax_t)len); + if (fn != NULL) + printf(" %s", fn); + printf("\n"); } void -psum1(char *fn, u_int32_t val, u_int32_t len) +psum1(char *fn, uint32_t val, off_t len) { - (void)printf("%lu %lu", (u_long) val, (u_long) (len + 1023) / 1024); - if (fn) - (void)printf(" %s", fn); - (void)printf("\n"); + printf("%lu %jd", (u_long)val, (intmax_t)(len + 1023) / 1024); + if (fn != NULL) + printf(" %s", fn); + printf("\n"); } void -psum2(char *fn, u_int32_t val, u_int32_t len) +psum2(char *fn, uint32_t val, off_t len) { - (void)printf("%lu %lu", (u_long) val, (u_long) (len + 511) / 512); - if (fn) - (void)printf(" %s", fn); - (void)printf("\n"); + printf("%lu %jd", (u_long)val, (intmax_t)(len + 511) / 512); + if (fn != NULL) + printf(" %s", fn); + printf("\n"); } diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c index 127a1d1ad4..c3eb1ad258 100644 --- a/usr.bin/cksum/sum1.c +++ b/usr.bin/cksum/sum1.c @@ -31,19 +31,23 @@ * SUCH DAMAGE. * * @(#)sum1.c 8.1 (Berkeley) 6/6/93 - * $FreeBSD: src/usr.bin/cksum/sum1.c,v 1.4 1999/12/05 20:03:22 charnier Exp $ + * $FreeBSD: src/usr.bin/cksum/sum1.c,v 1.8 2003/03/13 23:32:28 robert Exp $ * $DragonFly: src/usr.bin/cksum/sum1.c,v 1.4 2005/04/10 20:55:38 drhodus Exp $ */ #include + #include +#include + +#include "extern.h" int -csum1(int fd, u_int32_t *cval, u_int32_t *clen) +csum1(int fd, uint32_t *cval, off_t *clen) { - u_int32_t total; int nr; - u_int crc; + u_int lcrc; + off_t total; u_char *p; u_char buf[8192]; @@ -51,17 +55,17 @@ csum1(int fd, u_int32_t *cval, u_int32_t *clen) * 16-bit checksum, rotating right before each addition; * overflow is discarded. */ - crc = total = 0; + lcrc = total = 0; while ((nr = read(fd, buf, sizeof(buf))) > 0) for (total += nr, p = buf; nr--; ++p) { - if (crc & 1) - crc |= 0x10000; - crc = ((crc >> 1) + *p) & 0xffff; + if (lcrc & 1) + lcrc |= 0x10000; + lcrc = ((lcrc >> 1) + *p) & 0xffff; } if (nr < 0) - return(1); + return (1); - *cval = crc; + *cval = lcrc; *clen = total; - return(0); + return (0); } diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c index a684af85f7..893ad00da6 100644 --- a/usr.bin/cksum/sum2.c +++ b/usr.bin/cksum/sum2.c @@ -31,18 +31,23 @@ * SUCH DAMAGE. * * @(#)sum2.c 8.1 (Berkeley) 6/6/93 - * $FreeBSD: src/usr.bin/cksum/sum2.c,v 1.4 1999/12/05 20:03:22 charnier Exp $ + * $FreeBSD: src/usr.bin/cksum/sum2.c,v 1.8 2003/03/13 23:32:28 robert Exp $ * $DragonFly: src/usr.bin/cksum/sum2.c,v 1.4 2005/04/10 20:55:38 drhodus Exp $ */ #include + #include +#include + +#include "extern.h" int -csum2(int fd, u_int32_t *cval, u_int32_t *clen) +csum2(int fd, uint32_t *cval, off_t *clen) { - u_int32_t crc, total; + uint32_t lcrc; int nr; + off_t total; u_char *p; u_char buf[8192]; @@ -51,19 +56,19 @@ csum2(int fd, u_int32_t *cval, u_int32_t *clen) * * s = sum of all bytes * r = s % 2^16 + (s % 2^32) / 2^16 - * crc = (r % 2^16) + r / 2^16 + * lcrc = (r % 2^16) + r / 2^16 */ - crc = total = 0; + lcrc = total = 0; while ((nr = read(fd, buf, sizeof(buf))) > 0) for (total += nr, p = buf; nr--; ++p) - crc += *p; + lcrc += *p; if (nr < 0) - return(1); + return (1); - crc = (crc & 0xffff) + (crc >> 16); - crc = (crc & 0xffff) + (crc >> 16); + lcrc = (lcrc & 0xffff) + (lcrc >> 16); + lcrc = (lcrc & 0xffff) + (lcrc >> 16); - *cval = crc; + *cval = lcrc; *clen = total; - return(0); + return (0); } -- 2.11.4.GIT