- Align the function prototype of the external `crc' function with

   how `crc' is actually defined.
 - Remove an unnecessary `extern' variable declaration.
Data type corrections:
 - Define a variable which contains a file byte offset value as type
   off_t as required by the `crc' function.
 - Change the type of a variable carrying a CRC checksum from `u_long'
   to `uint32_t'.
 - Substitute the wrong `extern' variable declaration of `crc_total'
   by putting a correct one in the shared header extern.h.
   `crc_total' is defined as an `uint32_t', thus fixing
   incorrect mtree checksums on big-endian LP64 machines.

1 files changed, 3 insertions, 3 deletions

diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index a0de667..9aa768f 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -79,9 +79,9 @@ compare(name, s, p)
 	register NODE *s;
 	register FTSENT *p;
 {
-	extern int uflag;
-	u_long len, val;
+	uint32_t val;
 	int fd, label;
+	off_t len;
 	char *cp;
 	const char *tab = "";
 	char *fflags;
@@ -211,7 +211,7 @@ typeerr:		LABEL;
 			if (s->cksum != val) {
 				LABEL;
 				(void)printf("%scksum expected %lu found %lu\n",
-				    tab, s->cksum, val);
+				    tab, s->cksum, (unsigned long)val);
 				tab = "\t";
 			}
 		}