- For variables holding offset values, use off_t rather than

   int, long int or u_int32_t.  This changes the interface of
   all the CRC calculation and output functions from cksum.
 - Print variables of type off_t as intmax_t using a cast and %jd.
 - Use the standardized uint32_t type instead of u_int32_t.
   To have uint32_t defined, include <stdint.h> where necessary.
Style(9):
 - Move #include directives where they belong (esp. crc32.c).
 - Add empty lines between #include directives of system headers,
   standard library headers and local headers.
 - Test a pointer value against NULL.
 - Put a space after the return keyword.

PR:		bin/48424

1 files changed, 7 insertions, 4 deletions

diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index b3a6c64..c179c62 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -40,15 +40,18 @@ static char sccsid[] = "@(#)sum2.c	8.1 (Berkeley) 6/6/93";
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+
 #include <unistd.h>
+#include <stdint.h>
 
 #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 lcrc, total;
+	uint32_t lcrc;
 	int nr;
+	off_t total;
 	u_char *p;
 	u_char buf[8192];
 
@@ -64,12 +67,12 @@ csum2(int fd, u_int32_t *cval, u_int32_t *clen)
 		for (total += nr, p = buf; nr--; ++p)
 			lcrc += *p;
 	if (nr < 0)
-		return(1);
+		return (1);
 
 	lcrc = (lcrc & 0xffff) + (lcrc >> 16);
 	lcrc = (lcrc & 0xffff) + (lcrc >> 16);
 
 	*cval = lcrc;
 	*clen = total;
-	return(0);
+	return (0);
 }