unsigned vs unsigned int

10 files changed, 38 insertions, 38 deletions

diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index bca7bb7c4e1..4e90ce402e4 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -8,7 +8,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: malloc.c,v 1.47 2002/02/16 21:27:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: malloc.c,v 1.48 2002/05/27 03:13:23 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -186,10 +186,10 @@ static int fdzero;
 #endif
 
 /* Set when initialization has been done */
-static unsigned malloc_started;
+static unsigned int malloc_started;
 
 /* Number of free pages we cache */
-static unsigned malloc_cache = 16;
+static unsigned int malloc_cache = 16;
 
 /* The offset from pagenumber to index into the page directory */
 static u_long malloc_origo;
diff --git a/lib/libwrap/options.c b/lib/libwrap/options.c
index 411cf72b2ef..53a3a449a5d 100644
--- a/lib/libwrap/options.c
+++ b/lib/libwrap/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.2 1997/03/04 16:32:36 bitblt Exp $	*/
+/*	$OpenBSD: options.c,v 1.3 2002/05/27 03:13:23 deraadt Exp $	*/
 
  /*
   * General skeleton for adding options to the access control language. The
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#) options.c 1.17 96/02/11 17:01:31";
 #else
-static char rcsid[] = "$OpenBSD: options.c,v 1.2 1997/03/04 16:32:36 bitblt Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.3 2002/05/27 03:13:23 deraadt Exp $";
 #endif
 #endif
 
@@ -298,7 +298,7 @@ static void umask_option(value, request)
 char   *value;
 struct request_info *request;
 {
-    unsigned mask;
+    unsigned int mask;
     char    junk;
 
     if (sscanf(value, "%o%c", &mask, &junk) != 1 || (mask & 0777) != mask)
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index c931630b37b..3d0bda538a0 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: dir.c,v 1.37 2001/11/11 12:35:02 espie Exp $ */
+/*	$OpenBSD: dir.c,v 1.38 2002/05/27 03:14:21 deraadt Exp $ */
 /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
 
 /*
@@ -248,7 +248,7 @@ record_stamp(file, t)
     const char		*file;
     TIMESTAMP		t;
 {
-    unsigned		slot;
+    unsigned int	slot;
     const char		*end = NULL;
     struct file_stamp	*n;
 
@@ -276,7 +276,7 @@ add_file(p, file)
     Path		*p;
     const char		*file;
 {
-    unsigned		slot;
+    unsigned int	slot;
     const char		*end = NULL;
     char		*n;
     struct ohash 	*h = &p->files;
@@ -306,7 +306,7 @@ free_hash(h)
     struct ohash 	*h;
 {
     void		*e;
-    unsigned		i;
+    unsigned int	i;
 
     for (e = ohash_first(h, &i); e != NULL; e = ohash_next(h, &i))
 	free(e);
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 75ca8871605..e855ec22b22 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkstr.c,v 1.5 2002/02/16 21:27:49 millert Exp $	*/
+/*	$OpenBSD: mkstr.c,v 1.6 2002/05/27 03:14:22 deraadt Exp $	*/
 /*	$NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: mkstr.c,v 1.5 2002/02/16 21:27:49 millert Exp $";
+static char rcsid[] = "$OpenBSD: mkstr.c,v 1.6 2002/05/27 03:14:22 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -93,7 +93,7 @@ void process(void);
 int match(char *);
 void copystr(void);
 int octdigit(char);
-unsigned hashit(char *, char, unsigned);
+unsigned int hashit(char *, char, unsigned);
 int fgetNUL(char *, int, FILE *);
 
 int
@@ -263,15 +263,15 @@ inithash()
 
 struct	hash {
 	long	hval;
-	unsigned hpt;
+	unsigned int hpt;
 	struct	hash *hnext;
 } *bucket[NBUCKETS];
 
-unsigned
+unsigned int
 hashit(str, really, fakept)
 	char *str;
 	char really;
-	unsigned fakept;
+	unsigned int fakept;
 {
 	int i;
 	struct hash *hp;
diff --git a/usr.bin/oldrdist/lookup.c b/usr.bin/oldrdist/lookup.c
index adbabb9ea64..c9b0b0ecd7a 100644
--- a/usr.bin/oldrdist/lookup.c
+++ b/usr.bin/oldrdist/lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lookup.c,v 1.6 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: lookup.c,v 1.7 2002/05/27 03:14:22 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -35,7 +35,7 @@
 
 #ifndef lint
 /* from: static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: lookup.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: lookup.c,v 1.7 2002/05/27 03:14:22 deraadt Exp $";
 #endif /* not lint */
 
 #include "defs.h"
@@ -126,7 +126,7 @@ lookup(name, action, value)
 	int action;
 	struct namelist *value;
 {
-	unsigned n;
+	unsigned int n;
 	char *cp;
 	struct syment *s;
 	char buf[BUFSIZ];
diff --git a/usr.bin/rdist/common.c b/usr.bin/rdist/common.c
index b5d378b0eaa..f06e5735557 100644
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.13 2002/05/06 19:48:14 millert Exp $	*/
+/*	$OpenBSD: common.c,v 1.14 2002/05/27 03:14:22 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: common.c,v 6.82 1998/03/23 23:27:33 michaelc Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: common.c,v 1.13 2002/05/06 19:48:14 millert Exp $";
+"$OpenBSD: common.c,v 1.14 2002/05/27 03:14:22 deraadt Exp $";
 #endif
 
 static char sccsid[] = "@(#)common.c";
@@ -928,8 +928,8 @@ char *xrealloc(baseptr, amt)
  * calloc with error checking
  */
 char *xcalloc(num, esize)
-	unsigned num;
-	unsigned esize;
+	unsigned int num;
+	unsigned int esize;
 {
 	char *ptr;
 	extern POINTER *calloc();
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index a839afce822..3d5c9560bd6 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lookup.c,v 1.9 2001/11/19 19:02:15 mpech Exp $	*/
+/*	$OpenBSD: lookup.c,v 1.10 2002/05/27 03:14:22 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -39,7 +39,7 @@ static char RCSid[] =
 "$From: lookup.c,v 6.8 1996/07/19 16:49:55 michaelc Exp $";
 #else
 static char RCSid[] = 
-"$OpenBSD: lookup.c,v 1.9 2001/11/19 19:02:15 mpech Exp $";
+"$OpenBSD: lookup.c,v 1.10 2002/05/27 03:14:22 deraadt Exp $";
 #endif
 
 static char sccsid[] = "@(#)lookup.c	5.1 (Berkeley) 6/6/85";
@@ -137,7 +137,7 @@ lookup(name, action, value)	/* %% in name.  Ignore quotas in name */
 	int action;
 	struct namelist *value;
 {
-	unsigned n;
+	unsigned int n;
 	char *cp;
 	struct syment *s;
 	char ebuf[BUFSIZ];
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 46209dbdf88..4cd435f2f75 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_main.c,v 1.12 2002/02/16 21:27:51 millert Exp $	 */
+/* $OpenBSD: rpc_main.c,v 1.13 2002/05/27 03:14:22 deraadt Exp $	 */
 /* $NetBSD: rpc_main.c,v 1.9 1996/02/19 11:12:43 pk Exp $	 */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static char     sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
-static char     cvsid[] = "$OpenBSD: rpc_main.c,v 1.12 2002/02/16 21:27:51 millert Exp $";
+static char     cvsid[] = "$OpenBSD: rpc_main.c,v 1.13 2002/05/27 03:14:22 deraadt Exp $";
 #endif
 
 /*
@@ -486,9 +486,9 @@ c_initialize()
 char            rpcgen_table_dcl[] = "struct rpcgen_table {\n\
 	char	*(*proc)();\n\
 	xdrproc_t	xdr_arg;\n\
-	unsigned	len_arg;\n\
+	unsigned int	len_arg;\n\
 	xdrproc_t	xdr_res;\n\
-	unsigned	len_res;\n\
+	unsigned int	len_res;\n\
 };\n";
 
 
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index deac54b8b34..43ca8696f2b 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ruptime.c,v 1.7 2002/02/16 21:27:52 millert Exp $	*/
+/*	$OpenBSD: ruptime.c,v 1.8 2002/05/27 03:14:22 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1983 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)ruptime.c	5.8 (Berkeley) 7/21/90";*/
-static char rcsid[] = "$OpenBSD: ruptime.c,v 1.7 2002/02/16 21:27:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: ruptime.c,v 1.8 2002/05/27 03:14:22 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -190,17 +190,17 @@ interval(tval, updown)
 	int days, hours, minutes;
 
 	if (tval < 0 || tval > 999*24*60*60) {
-		(void)sprintf(resbuf, "%s     ??:??", updown);
+		(void)snprintf(resbuf, sizeof resbuf, "%s     ??:??", updown);
 		return(resbuf);
 	}
 	minutes = (tval + 59) / 60;		/* round to minutes */
 	hours = minutes / 60; minutes %= 60;
 	days = hours / 24; hours %= 24;
 	if (days)
-		(void)sprintf(resbuf, "%s %3d+%02d:%02d",
+		(void)snprintf(resbuf, sizeof resbuf, "%s %3d+%02d:%02d",
 		    updown, days, hours, minutes);
 	else
-		(void)sprintf(resbuf, "%s     %2d:%02d",
+		(void)snprintf(resbuf, sizeof resbuf, "%s     %2d:%02d",
 		    updown, hours, minutes);
 	return(resbuf);
 }
diff --git a/usr.bin/tip/value.c b/usr.bin/tip/value.c
index 8a11781c377..84c1bbdd4f3 100644
--- a/usr.bin/tip/value.c
+++ b/usr.bin/tip/value.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: value.c,v 1.8 2002/05/07 06:56:50 hugh Exp $	*/
+/*	$OpenBSD: value.c,v 1.9 2002/05/27 03:14:22 deraadt Exp $	*/
 /*	$NetBSD: value.c,v 1.6 1997/02/11 09:24:09 mrg Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] = "$OpenBSD: value.c,v 1.8 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: value.c,v 1.9 2002/05/27 03:14:22 deraadt Exp $";
 #endif /* not lint */
 
 #include "tip.h"
@@ -266,7 +266,7 @@ vprint(p)
 
 static int
 vaccess(mode, rw)
-	unsigned mode, rw;
+	unsigned int mode, rw;
 {
 	if (mode & (rw<<PUBLIC))
 		return (1);