Use ISO C99 / POSIX types. Should fix PR 40416.

5 files changed, 19 insertions, 19 deletions

diff --git a/pkgtools/mtree/files/compare.c b/pkgtools/mtree/files/compare.c
index 9e187cf7635..7ff13378178 100644
--- a/pkgtools/mtree/files/compare.c
+++ b/pkgtools/mtree/files/compare.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: compare.c,v 1.5 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: compare.c,v 1.6 2010/03/21 16:30:17 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: compare.c,v 1.5 2008/11/06 02:14:52 jschauma Exp $");
+__RCSID("$NetBSD: compare.c,v 1.6 2010/03/21 16:30:17 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -151,7 +151,7 @@ do {									\
 int
 compare(NODE *s, FTSENT *p)
 {
-	u_int32_t len, val, flags;
+	uint32_t len, val, flags;
 	int fd, label;
 	const char *cp, *tab;
 #if !defined(NO_MD5) || !defined(NO_RMD160) || !defined(NO_SHA1) || !defined(NO_SHA2)
diff --git a/pkgtools/mtree/files/crc.c b/pkgtools/mtree/files/crc.c
index bde45ab5161..548584b707f 100644
--- a/pkgtools/mtree/files/crc.c
+++ b/pkgtools/mtree/files/crc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: crc.c,v 1.4 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: crc.c,v 1.5 2010/03/21 16:30:17 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -47,7 +47,7 @@
 #if 0
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: crc.c,v 1.4 2008/11/06 02:14:52 jschauma Exp $");
+__RCSID("$NetBSD: crc.c,v 1.5 2010/03/21 16:30:17 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -67,7 +67,7 @@ __RCSID("$NetBSD: crc.c,v 1.4 2008/11/06 02:14:52 jschauma Exp $");
 
 #include "extern.h"
 
-static const u_int32_t crctab[] = {
+static const uint32_t crctab[] = {
 	0x0,
 	0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
 	0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
@@ -129,15 +129,15 @@ static const u_int32_t crctab[] = {
  * success and 1 on failure.  Errno is set on failure.
  */
 extern int sflag;
-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, uint32_t *clen)
 {
 	u_char *p;
 	int nr;
-	u_int32_t thecrc, len;
-	u_int32_t crctot;
+	uint32_t thecrc, len;
+	uint32_t crctot;
 	u_char buf[16 * 1024];
 
 #define	COMPUTE(var, ch)	(var) = (var) << 8 ^ crctab[(var) >> 24 ^ (ch)]
diff --git a/pkgtools/mtree/files/create.c b/pkgtools/mtree/files/create.c
index 668f2306c32..e1bdceba231 100644
--- a/pkgtools/mtree/files/create.c
+++ b/pkgtools/mtree/files/create.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: create.c,v 1.6 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: create.c,v 1.7 2010/03/21 16:30:17 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: create.c,v 1.6 2008/11/06 02:14:52 jschauma Exp $");
+__RCSID("$NetBSD: create.c,v 1.7 2010/03/21 16:30:17 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -186,7 +186,7 @@ cwalk(void)
 static void
 statf(FTSENT *p)
 {
-	u_int32_t len, val;
+	uint32_t len, val;
 	int fd, indent;
 	const char *name;
 #if !defined(NO_MD5) || !defined(NO_RMD160) || !defined(NO_SHA1) || !defined(NO_SHA2)
diff --git a/pkgtools/mtree/files/extern.h b/pkgtools/mtree/files/extern.h
index 0d2aa102301..3e3bb583fce 100644
--- a/pkgtools/mtree/files/extern.h
+++ b/pkgtools/mtree/files/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.3 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: extern.h,v 1.4 2010/03/21 16:30:17 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -64,7 +64,7 @@
 void	 addtag(slist_t *, char *);
 int	 check_excludes(const char *, const char *);
 int	 compare(NODE *, FTSENT *);
-int	 crc(int, u_int32_t *, u_int32_t *);
+int	 crc(int, uint32_t *, uint32_t *);
 void	 cwalk(void);
 void	 dump_nodes(const char *, NODE *, int);
 void	 init_excludes(void);
@@ -82,7 +82,7 @@ int	 verify(void);
 extern int	dflag, eflag, iflag, lflag, mflag, rflag, sflag, tflag, uflag;
 extern int	mtree_Mflag, mtree_Wflag;
 extern size_t	mtree_lineno;
-extern u_int32_t crc_total;
+extern uint32_t crc_total;
 extern int	ftsoptions, keys;
 extern char	fullpath[];
 extern slist_t	includetags, excludetags;
diff --git a/pkgtools/mtree/files/verify.c b/pkgtools/mtree/files/verify.c
index 028fd4e7618..478e10fe306 100644
--- a/pkgtools/mtree/files/verify.c
+++ b/pkgtools/mtree/files/verify.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: verify.c,v 1.5 2008/11/06 02:14:52 jschauma Exp $	*/
+/*	$NetBSD: verify.c,v 1.6 2010/03/21 16:30:17 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -44,7 +44,7 @@
 #if 0
 static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: verify.c,v 1.5 2008/11/06 02:14:52 jschauma Exp $");
+__RCSID("$NetBSD: verify.c,v 1.6 2010/03/21 16:30:17 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -189,7 +189,7 @@ miss(NODE *p, char *tail)
 	int create;
 	char *tp;
 	const char *type;
-	u_int32_t flags;
+	uint32_t flags;
 
 	for (; p; p = p->next) {
 		if (p->flags & F_OPT && !(p->flags & F_VISIT))