kill more registers.

millert@ ok
author: mpech <mpech@openbsd.org> 2002-03-14 16:44:24 +0000
committer: mpech <mpech@openbsd.org> 2002-03-14 16:44:24 +0000
commit: 0ac0d02e42d4106958da32c3dbc8eb258851b30a (patch)
tree: b3bd2e9ab5d67b121452693e317c78f627a07535
parent: split out ssh1 session key decryption; ok provos@ (diff)
download: wireguard-openbsd-0ac0d02e42d4106958da32c3dbc8eb258851b30a.tar.xz
wireguard-openbsd-0ac0d02e42d4106958da32c3dbc8eb258851b30a.zip
66 files changed, 634 insertions, 634 deletions
diff --git a/bin/mt/mtrmt.c b/bin/mt/mtrmt.c
index d2874ba023a..fbe37b78e19 100644
--- a/bin/mt/mtrmt.c
+++ b/bin/mt/mtrmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtrmt.c,v 1.10 2002/02/19 19:39:35 millert Exp $	*/
+/*	$OpenBSD: mtrmt.c,v 1.11 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: mtrmt.c,v 1.2 1996/03/06 06:22:07 scottr Exp $	*/
 
 /*-
@@ -123,7 +123,7 @@ rmtconnaborted(void)
 void
 rmtgetconn()
 {
-	register char *cp;
+	char *cp;
 	static struct servent *sp = NULL;
 	static struct passwd *pwd = NULL;
 #ifdef notdef
@@ -180,8 +180,8 @@ static int
 okname(cp0)
 	char *cp0;
 {
-	register char *cp;
-	register int c;
+	char *cp;
+	int c;
 
 	for (cp = cp0; *cp; cp++) {
 		c = *cp;
@@ -220,8 +220,8 @@ struct	mtget mts;
 struct mtget *
 rmtstatus()
 {
-	register int i;
-	register char *cp;
+	int i;
+	char *cp;
 
 	if (rmtstate != TS_OPEN)
 		return (NULL);
@@ -257,7 +257,7 @@ static int
 rmtreply(cmd)
 	char *cmd;
 {
-	register char *cp;
+	char *cp;
 	char code[30], emsg[BUFSIZ];
 
 	rmtgets(code, sizeof (code));
@@ -299,7 +299,7 @@ rmtgets(line, len)
 	char *line;
 	int len;
 {
-	register char *cp = line;
+	char *cp = line;
 
 	while (len > 1) {
 		*cp = rmtgetb();
diff --git a/sbin/newlfs/newfs.c b/sbin/newlfs/newfs.c
index db9881658fa..de530d4448e 100644
--- a/sbin/newlfs/newfs.c
+++ b/sbin/newlfs/newfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: newfs.c,v 1.9 2002/02/16 21:27:37 millert Exp $	*/
+/*	$OpenBSD: newfs.c,v 1.10 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: newfs.c,v 1.5 1996/05/16 07:17:50 thorpej Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.5 (Berkeley) 5/24/95";
 #else
-static char rcsid[] = "$OpenBSD: newfs.c,v 1.9 2002/02/16 21:27:37 millert Exp $";
+static char rcsid[] = "$OpenBSD: newfs.c,v 1.10 2002/03/14 16:44:24 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -128,9 +128,9 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register int ch;
-	register struct partition *pp;
-	register struct disklabel *lp;
+	int ch;
+	struct partition *pp;
+	struct disklabel *lp;
 	struct partition oldpartition;
 	struct stat st;
 	int debug, lfs, fsi, fso, segsize, maxpartitions;
@@ -385,7 +385,7 @@ static void
 rewritelabel(s, fd, lp)
 	char *s;
 	int fd;
-	register struct disklabel *lp;
+	struct disklabel *lp;
 {
 #ifdef COMPAT
 	if (unlabeled)
@@ -400,7 +400,7 @@ rewritelabel(s, fd, lp)
 	}
 #if vax
 	if (lp->d_type == DTYPE_SMD && lp->d_flags & D_BADSECT) {
-		register i;
+		int i;
 		int cfd;
 		daddr_t alt;
 		char specname[64];
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 31cf976f068..86b428800fb 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.14 2002/03/08 11:06:17 mpech Exp $	*/
+/*	$OpenBSD: main.c,v 1.15 2002/03/14 16:44:24 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -39,7 +39,7 @@ char copyright[] =
 #if !defined(lint)
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.14 2002/03/08 11:06:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.15 2002/03/14 16:44:24 mpech Exp $";
 #endif
 
 #include "defs.h"
@@ -633,7 +633,7 @@ void
 rip_off(void)
 {
 	struct interface *ifp;
-	register naddr addr;
+	naddr addr;
 
 
 	if (rip_sock >= 0 && !mhome) {
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index d19310b51d5..2aefbbc9ea7 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: table.c,v 1.6 2001/07/07 18:26:20 deraadt Exp $	*/
+/*	$OpenBSD: table.c,v 1.7 2002/03/14 16:44:24 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -621,7 +621,7 @@ masktrim(struct sockaddr_in *ap)
 masktrim(struct sockaddr_in_new *ap)
 #endif
 {
-	register char *cp;
+	char *cp;
 
 	if (ap->sin_addr.s_addr == 0) {
 		ap->sin_len = 0;
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index e3d9ec62f98..68005ebfdff 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: head.c,v 1.8 2002/02/16 21:27:46 millert Exp $	*/
+/*	$OpenBSD: head.c,v 1.9 2002/03/14 16:44:24 mpech Exp $	*/
 
 /*
  * Copyright (c) 1980, 1987 Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)head.c	5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: head.c,v 1.8 2002/02/16 21:27:46 millert Exp $";
+static char rcsid[] = "$OpenBSD: head.c,v 1.9 2002/03/14 16:44:24 mpech Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -65,7 +65,7 @@ main(argc, argv)
 	int	argc;
 	char	**argv;
 {
-	register long cnt;
+	long 	cnt;
 	int	ch, firsttime;
 	long	linecnt = 10;
 	char	*inval = NULL, *p = NULL;
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 6e4c0ee6c6d..1b6d4249881 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arp.c,v 1.20 2002/03/14 06:51:42 mpech Exp $ */
+/*	$OpenBSD: arp.c,v 1.21 2002/03/14 16:44:24 mpech Exp $ */
 /*	$NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */
 
 /*
@@ -45,7 +45,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)arp.c	8.2 (Berkeley) 1/2/94";*/
-static char *rcsid = "$OpenBSD: arp.c,v 1.20 2002/03/14 06:51:42 mpech Exp $";
+static char *rcsid = "$OpenBSD: arp.c,v 1.21 2002/03/14 16:44:24 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -240,9 +240,9 @@ set(argc, argv)
 	int argc;
 	char **argv;
 {
-	register struct sockaddr_inarp *sin;
-	register struct sockaddr_dl *sdl;
-	register struct rt_msghdr *rtm;
+	struct sockaddr_inarp *sin;
+	struct sockaddr_dl *sdl;
+	struct rt_msghdr *rtm;
 	u_char *eaddr;
 	struct ether_addr *ea;
 	char *host = argv[0];
@@ -362,8 +362,8 @@ delete(host, info)
 	const char *host;
 	const char *info;
 {
-	register struct sockaddr_inarp *sin;
-	register struct rt_msghdr *rtm;
+	struct sockaddr_inarp *sin;
+	struct rt_msghdr *rtm;
 	struct sockaddr_dl *sdl;
 
 	sin = &sin_m;
@@ -544,9 +544,9 @@ rtmsg(cmd)
 {
 	static int seq;
 	int rlen;
-	register struct rt_msghdr *rtm;
-	register char *cp;
-	register int l;
+	struct rt_msghdr *rtm;
+	char *cp;
+	int l;
 
 	rtm = &m_rtmsg.m_rtm;
 	cp = m_rtmsg.m_space;
diff --git a/usr.sbin/bad144/bad144.c b/usr.sbin/bad144/bad144.c
index 6cfb72c56fd..d7463397f92 100644
--- a/usr.sbin/bad144/bad144.c
+++ b/usr.sbin/bad144/bad144.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)bad144.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: bad144.c,v 1.10 2002/02/16 21:28:01 millert Exp $";
+static char *rcsid = "$Id: bad144.c,v 1.11 2002/03/14 16:44:24 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -97,7 +97,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register struct bt_bad *bt;
+	struct bt_bad *bt;
 	daddr_t	sn, bn[126];
 	int i, f, nbad, new, bad, errs;
 
@@ -343,7 +343,7 @@ daddr_t
 getold(f, bad)
 struct dkbad *bad;
 {
-	register int i;
+	int i;
 	daddr_t sn;
 	char msg[80];
 
@@ -373,8 +373,8 @@ struct dkbad *bad;
 int
 checkold()
 {
-	register int i;
-	register struct bt_bad *bt;
+	int i;
+	struct bt_bad *bt;
 	daddr_t sn, lsn = 0;
 	int errors = 0, warned = 0;
 
@@ -469,7 +469,7 @@ int
 blkcopy(f, s1, s2)
 daddr_t s1, s2;
 {
-	register int tries, n;
+	int tries, n;
 
 	if (buf == (char *)NULL) {
 		buf = malloc((unsigned)dp->d_secsize);
@@ -634,7 +634,7 @@ format(fd, blk)
 	int fd;
 	daddr_t blk;
 {
-	register struct formats *fp;
+	struct formats *fp;
 	static char *buf;
 	static char bufsize;
 	struct format_op fop;
diff --git a/usr.sbin/bootpd/bootptest.c b/usr.sbin/bootpd/bootptest.c
index 337bbaabe62..9d0e8478df2 100644
--- a/usr.sbin/bootpd/bootptest.c
+++ b/usr.sbin/bootpd/bootptest.c
@@ -444,9 +444,9 @@ send_request(s)
  */
 int
 printfn(s, ep)
-	register u_char *s, *ep;
+	u_char *s, *ep;
 {
-	register u_char c;
+	u_char c;
 
 	putchar('"');
 	while (c = *s++) {
diff --git a/usr.sbin/bootpd/getether.c b/usr.sbin/bootpd/getether.c
index 97fa943c979..dc890db31d3 100644
--- a/usr.sbin/bootpd/getether.c
+++ b/usr.sbin/bootpd/getether.c
@@ -113,10 +113,10 @@ getether(ifname, eap)
 	char *eap;					/* Ether address (output) */
 {
 	int fd, rc = -1;
-	register int n;
+	int n;
 	struct ifreq ibuf[16], ifr;
 	struct ifconf ifc;
-	register struct ifreq *ifrp, *ifend;
+	struct ifreq *ifrp, *ifend;
 
 	/* Fetch the interface configuration */
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
diff --git a/usr.sbin/bootpd/hash.c b/usr.sbin/bootpd/hash.c
index 1dba833889b..0f2649ba1a5 100644
--- a/usr.sbin/bootpd/hash.c
+++ b/usr.sbin/bootpd/hash.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: hash.c,v 1.1.1.1 1995/10/18 08:47:27 deraadt Exp $";
+static char rcsid[] = "$Id: hash.c,v 1.2 2002/03/14 16:44:24 mpech Exp $";
 #endif
 
 
@@ -88,8 +88,8 @@ hash_tbl *
 hash_Init(tablesize)
 	unsigned tablesize;
 {
-	register hash_tbl *hashtblptr;
-	register unsigned totalsize;
+	hash_tbl *hashtblptr;
+	unsigned int totalsize;
 
 	if (tablesize > 0) {
 		totalsize = sizeof(hash_tbl)
@@ -178,9 +178,9 @@ hash_Reset(hashtable, free_data)
 unsigned
 hash_HashFunction(string, len)
 	unsigned char *string;
-	register unsigned len;
+	unsigned int len;
 {
-	register unsigned accum;
+	unsigned int accum;
 
 	accum = 0;
 	for (; len > 0; len--) {
@@ -204,7 +204,7 @@ hash_Exists(hashtable, hashcode, compare, key)
 	hash_cmpfp compare;
 	hash_datum *key;
 {
-	register hash_member *memberptr;
+	hash_member *memberptr;
 
 	memberptr = (hashtable->table)[hashcode % (hashtable->size)];
 	while (memberptr) {
@@ -354,8 +354,8 @@ hash_datum *
 hash_NextEntry(hashtable)
 	hash_tbl *hashtable;
 {
-	register unsigned bucket;
-	register hash_member *memberptr;
+	unsigned int bucket;
+	hash_member *memberptr;
 
 	/*
 	 * First try to pick up where we left off.
diff --git a/usr.sbin/bootpd/hwaddr.c b/usr.sbin/bootpd/hwaddr.c
index ecd27eb26ea..809abd63f1a 100644
--- a/usr.sbin/bootpd/hwaddr.c
+++ b/usr.sbin/bootpd/hwaddr.c
@@ -231,7 +231,7 @@ static u_char conv802table[256] =
 
 void
 haddr_conv802(addr_in, addr_out, len)
-	register u_char *addr_in, *addr_out;
+	u_char *addr_in, *addr_out;
 	int len;
 {
 	u_char *lim;
diff --git a/usr.sbin/bootpd/print-bootp.c b/usr.sbin/bootpd/print-bootp.c
index 1a5b97ff896..60c544848e5 100644
--- a/usr.sbin/bootpd/print-bootp.c
+++ b/usr.sbin/bootpd/print-bootp.c
@@ -24,7 +24,7 @@
  * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov>
  */
 #ifndef lint
-static char rcsid[] = "$Id: print-bootp.c,v 1.2 1998/11/28 04:07:24 millert Exp $";
+static char rcsid[] = "$Id: print-bootp.c,v 1.3 2002/03/14 16:44:24 mpech Exp $";
 /* 93/10/10 <gwr@mc.com> New data-driven option print routine. */
 #endif
 
@@ -99,8 +99,8 @@ bootp_print(bp, length, sport, dport)
 
 	/* Client's Hardware address */
 	if (bp->bp_hlen) {
-		register struct ether_header *eh;
-		register char *e;
+		struct ether_header *eh;
+		char *e;
 
 		TCHECK(bp->bp_chaddr[0], 6);
 		eh = (struct ether_header *) packetp;
@@ -275,12 +275,12 @@ static void print_string();
 
 static void
 rfc1048_print(bp, length)
-	register u_char *bp;
+	u_char *bp;
 	int length;
 {
 	u_char tag;
 	u_char *ep;
-	register int len, j;
+	int len, j;
 	u_int32 ul;
 	u_short us;
 	struct in_addr ia;
@@ -377,7 +377,7 @@ rfc1048_print(bp, length)
 
 static void
 cmu_print(bp, length)
-	register u_char *bp;
+	u_char *bp;
 	int length;
 {
 	struct cmu_vend *v;
@@ -428,12 +428,12 @@ cmu_print(bp, length)
 
 static void
 other_print(bp, length)
-	register u_char *bp;
+	u_char *bp;
 	int length;
 {
 	u_char *ep;					/* end pointer */
 	u_char *zp;					/* points one past last non-zero byte */
-	register int i, j;
+	int i, j;
 
 	/* Setup end pointer */
 	ep = bp + length;
diff --git a/usr.sbin/bootpd/readfile.c b/usr.sbin/bootpd/readfile.c
index 15126a58f50..ff9e777e17d 100644
--- a/usr.sbin/bootpd/readfile.c
+++ b/usr.sbin/bootpd/readfile.c
@@ -21,7 +21,7 @@ SOFTWARE.
 ************************************************************************/
 
 #ifndef lint
-static char rcsid[] = "$Id: readfile.c,v 1.4 1998/12/20 21:16:51 millert Exp $";
+static char rcsid[] = "$Id: readfile.c,v 1.5 2002/03/14 16:44:24 mpech Exp $";
 #endif
 
 
@@ -1313,7 +1313,7 @@ process_generic(src, dest, tagvalue)
 
 PRIVATE boolean
 goodname(hostname)
-	register char *hostname;
+	char *hostname;
 {
 	do {
 		if (!isalpha(*hostname++)) {	/* First character must be a letter */
@@ -1532,7 +1532,7 @@ PRIVATE void
 adjust(s)
 	char **s;
 {
-	register char *t;
+	char *t;
 
 	t = *s;
 	while (*t && (*t != ':')) {
@@ -1557,7 +1557,7 @@ PRIVATE void
 eat_whitespace(s)
 	char **s;
 {
-	register char *t;
+	char *t;
 
 	t = *s;
 	while (*t && isspace(*t)) {
@@ -1676,7 +1676,7 @@ prs_inetaddr(src, result)
 	u_int32 *result;
 {
 	char tmpstr[MAXSTRINGLEN];
-	register u_int32 value;
+	u_int32 value;
 	u_int32 parts[4], *pp;
 	int n;
 	char *s, *t;
@@ -1865,7 +1865,7 @@ PRIVATE u_int32
 get_u_long(src)
 	char **src;
 {
-	register u_int32 value, base;
+	u_int32 value, base;
 	char c;
 
 	/*
diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c
index e57cffc7a7d..a10b8f26e36 100644
--- a/usr.sbin/config/files.c
+++ b/usr.sbin/config/files.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: files.c,v 1.10 2002/02/17 19:42:35 millert Exp $	*/
+/*	$OpenBSD: files.c,v 1.11 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: files.c,v 1.6 1996/03/17 13:18:17 cgd Exp $	*/
 
 /*
@@ -198,7 +198,7 @@ addobject(path, optx, flags)
 void
 checkfiles()
 {
-	register struct files *fi, *last;
+	struct files *fi, *last;
 
 	last = NULL;
 	for (fi = *unchecked; fi != NULL; last = fi, fi = fi->fi_next)
@@ -217,7 +217,7 @@ checkaux(name, context)
 	const char *name;
 	void *context;
 {
-	register struct files *fi = context;
+	struct files *fi = context;
 
 	if (ht_lookup(devbasetab, name) == NULL) {
 		xerror(fi->fi_srcfile, fi->fi_srcline,
@@ -237,7 +237,7 @@ checkaux(name, context)
 int
 fixfiles()
 {
-	register struct files *fi, *ofi;
+	struct files *fi, *ofi;
 	struct nvlist *flathead, **flatp;
 	int err, sel;
 
@@ -332,12 +332,12 @@ fixobjects()
  */
 static int
 fixcount(name, context)
-	register const char *name;
+	const char *name;
 	void *context;
 {
-	register struct nvlist ***p = context;
-	register struct devbase *dev;
-	register struct nvlist *nv;
+	struct nvlist ***p = context;
+	struct devbase *dev;
+	struct nvlist *nv;
 
 	dev = ht_lookup(devbasetab, name);
 	if (dev == NULL)	/* cannot occur here; we checked earlier */
@@ -358,9 +358,9 @@ fixfsel(name, context)
 	const char *name;
 	void *context;
 {
-	register struct nvlist ***p = context;
-	register struct nvlist *nv;
-	register int sel;
+	struct nvlist ***p = context;
+	struct nvlist *nv;
+	int sel;
 
 	sel = ht_lookup(selecttab, name) != NULL;
 	nv = newnv(name, NULL, NULL, sel, NULL);
@@ -391,9 +391,9 @@ fixsel(name, context)
  */
 static int
 expr_eval(expr, fn, context)
-	register struct nvlist *expr;
-	register int (*fn)(const char *, void *);
-	register void *context;
+	struct nvlist *expr;
+	int (*fn)(const char *, void *);
+	void *context;
 {
 	int lhs, rhs;
 
@@ -424,9 +424,9 @@ expr_eval(expr, fn, context)
  */
 static void
 expr_free(expr)
-	register struct nvlist *expr;
+	struct nvlist *expr;
 {
-	register struct nvlist *rhs;
+	struct nvlist *rhs;
 
 	/* This loop traverses down the RHS of each subexpression. */
 	for (; expr != NULL; expr = rhs) {
@@ -469,7 +469,7 @@ prexpr(expr)
 
 static void
 pr0(e)
-	register struct nvlist *e;
+	struct nvlist *e;
 {
 
 	switch (e->nv_int) {
diff --git a/usr.sbin/config/hash.c b/usr.sbin/config/hash.c
index af9192bb600..0f51be47b51 100644
--- a/usr.sbin/config/hash.c
+++ b/usr.sbin/config/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.9 2000/11/15 01:49:52 angelos Exp $	*/
+/*	$OpenBSD: hash.c,v 1.10 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: hash.c,v 1.4 1996/11/07 22:59:43 gwr Exp $	*/
 
 /*
@@ -97,8 +97,8 @@ static void *
 poolalloc(size)
 	size_t size;
 {
-	register char *p;
-	register size_t alloc;
+	char *p;
+	size_t alloc;
 	static char *pool;
 	static size_t nleft;
 
@@ -124,11 +124,11 @@ poolalloc(size)
  */
 static void
 ht_init(ht, sz)
-	register struct hashtab *ht;
+	struct hashtab *ht;
 	size_t sz;
 {
-	register struct hashent **h;
-	register u_int n;
+	struct hashent **h;
+	u_int n;
 
 	h = emalloc(sz * sizeof *h);
 	ht->ht_tab = h;
@@ -145,10 +145,10 @@ ht_init(ht, sz)
  */
 static void
 ht_expand(ht)
-	register struct hashtab *ht;
+	struct hashtab *ht;
 {
-	register struct hashent *p, **h, **oldh, *q;
-	register u_int n, i;
+	struct hashent *p, **h, **oldh, *q;
+	u_int n, i;
 
 	n = ht->ht_size * 2;
 	h = emalloc(n * sizeof *h);
@@ -178,8 +178,8 @@ newhashent(name, h)
 	const char *name;
 	u_int h;
 {
-	register struct hashent *hp;
-	register char *m;
+	struct hashent *hp;
+	char *m;
 
 	m = poolalloc(sizeof(*hp) + ALIGNBYTES);
 	hp = (struct hashent *)ALIGN(m);
@@ -194,9 +194,9 @@ newhashent(name, h)
  */
 static inline u_int
 hash(str)
-	register const char *str;
+	const char *str;
 {
-	register u_int h;
+	u_int h;
 
 	for (h = 0; *str;)
 		h = (h << 5) + h + *str++;
@@ -216,13 +216,13 @@ initintern()
  */
 const char *
 intern(s)
-	register const char *s;
+	const char *s;
 {
-	register struct hashtab *ht;
-	register struct hashent *hp, **hpp;
-	register u_int h;
-	register char *p;
-	register size_t l;
+	struct hashtab *ht;
+	struct hashent *hp, **hpp;
+	u_int h;
+	char *p;
+	size_t l;
 
 	ht = &strings;
 	h = hash(s);
@@ -242,7 +242,7 @@ intern(s)
 struct hashtab *
 ht_new()
 {
-	register struct hashtab *ht;
+	struct hashtab *ht;
 
 	ht = emalloc(sizeof *ht);
 	ht_init(ht, 8);
@@ -254,11 +254,11 @@ ht_new()
  */
 int
 ht_remove(ht, nam)
-	register struct hashtab *ht;
-	register const char *nam;
+	struct hashtab *ht;
+	const char *nam;
 {
-	register struct hashent *hp, *thp;
-	register u_int h;
+	struct hashent *hp, *thp;
+	u_int h;
 
 	h = hash(nam);
 	hp = ht->ht_tab[h & ht->ht_mask];
@@ -287,13 +287,13 @@ ht_remove(ht, nam)
  */
 int
 ht_insrep(ht, nam, val, replace)
-	register struct hashtab *ht;
-	register const char *nam;
+	struct hashtab *ht;
+	const char *nam;
 	void *val;
 	int replace;
 {
-	register struct hashent *hp, **hpp;
-	register u_int h;
+	struct hashent *hp, **hpp;
+	u_int h;
 
 	h = hash(nam);
 	hpp = &ht->ht_tab[h & ht->ht_mask];
@@ -313,11 +313,11 @@ ht_insrep(ht, nam, val, replace)
 
 void *
 ht_lookup(ht, nam)
-	register struct hashtab *ht;
-	register const char *nam;
+	struct hashtab *ht;
+	const char *nam;
 {
-	register struct hashent *hp, **hpp;
-	register u_int h;
+	struct hashent *hp, **hpp;
+	u_int h;
 
 	h = hash(nam);
 	hpp = &ht->ht_tab[h & ht->ht_mask];
diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 4feedfd8ab5..8c99e5655bc 100644
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.24 2002/02/17 19:42:35 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.25 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $	*/
 
 /*
@@ -101,7 +101,7 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register char *p;
+	char *p;
 	const char *last_component;
 	char *outfile = NULL;
 	int pflag, ch, eflag, uflag, fflag;
@@ -326,8 +326,8 @@ void
 defoption(name)
 	const char *name;
 {
-	register const char *n;
-	register char *p, c;
+	const char *n;
+	char *p, c;
 	char low[500];
 
 	/*
@@ -358,9 +358,9 @@ void
 removeoption(name)
         const char *name;
 {
-	register struct nvlist *nv, *nvt;
-	register const char *n;
-	register char *p, c;
+	struct nvlist *nv, *nvt;
+	const char *n;
+	char *p, c;
 	char low[500];
 
 	if ((nv = ht_lookup(opttab, name)) != NULL) {
@@ -400,8 +400,8 @@ void
 addoption(name, value)
 	const char *name, *value;
 {
-	register const char *n;
-	register char *p, c;
+	const char *n;
+	char *p, c;
 	char low[500];
 
 	if (do_option(opttab, &nextopt, name, value, "options"))
@@ -435,7 +435,7 @@ do_option(ht, nppp, name, value, type)
 	struct nvlist ***nppp;
 	const char *name, *value, *type;
 {
-	register struct nvlist *nv;
+	struct nvlist *nv;
 
 	/* assume it will work */
 	nv = newnv(name, value, NULL, 0, NULL);
@@ -462,10 +462,10 @@ do_option(ht, nppp, name, value, type)
  */
 int
 deva_has_instances(deva, unit)
-	register struct deva *deva;
+	struct deva *deva;
 	int unit;
 {
-	register struct devi *i;
+	struct devi *i;
 
 	if (unit == WILD)
 		return (deva->d_ihead != NULL);
@@ -481,10 +481,10 @@ deva_has_instances(deva, unit)
  */
 int
 devbase_has_instances(dev, unit)
-	register struct devbase *dev;
+	struct devbase *dev;
 	int unit;
 {
-	register struct deva *da;
+	struct deva *da;
 
 	for (da = dev->d_ahead; da != NULL; da = da->d_bsame)
 		if (deva_has_instances(da, unit))
@@ -494,9 +494,9 @@ devbase_has_instances(dev, unit)
 
 static int
 hasparent(i)
-	register struct devi *i;
+	struct devi *i;
 {
-	register struct nvlist *nv;
+	struct nvlist *nv;
 	int atunit = i->i_atunit;
 
 	/*
@@ -529,12 +529,12 @@ hasparent(i)
 
 static int
 cfcrosscheck(cf, what, nv)
-	register struct config *cf;
+	struct config *cf;
 	const char *what;
-	register struct nvlist *nv;
+	struct nvlist *nv;
 {
-	register struct devbase *dev;
-	register struct devi *pd;
+	struct devbase *dev;
+	struct devi *pd;
 	int errs, devminor;
 
 	if (maxpartitions <= 0)
@@ -575,8 +575,8 @@ loop:
 int
 crosscheck()
 {
-	register struct devi *i;
-	register struct config *cf;
+	struct devi *i;
+	struct config *cf;
 	int errs;
 
 	errs = 0;
@@ -611,10 +611,10 @@ crosscheck()
 int
 badstar()
 {
-	register struct devbase *d;
-	register struct deva *da;
-	register struct devi *i;
-	register int errs, n;
+	struct devbase *d;
+	struct deva *da;
+	struct devi *i;
+	int errs, n;
 
 	errs = 0;
 	for (d = allbases; d != NULL; d = d->d_next) {
@@ -713,7 +713,7 @@ optcmp(sp1, sp2)
 void
 optiondelta()
 {
-	register struct nvlist *nv;
+	struct nvlist *nv;
 	char nbuf[BUFSIZ], obuf[BUFSIZ];	/* XXX size */
 	int nnewopts, ret = 0, i;
 	struct opt *newopts;
diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c
index 4b383e4a03a..376e4baac25 100644
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkheaders.c,v 1.11 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: mkheaders.c,v 1.12 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: mkheaders.c,v 1.12 1997/02/02 21:12:34 thorpej Exp $	*/
 
 /*
@@ -64,8 +64,8 @@ static char *cntname(const char *);
 int
 mkheaders()
 {
-	register struct files *fi;
-	register struct nvlist *nv;
+	struct files *fi;
+	struct nvlist *nv;
 
 	for (fi = allfiles; fi != NULL; fi = fi->fi_next) {
 		if (fi->fi_flags & FI_HIDDEN)
@@ -84,10 +84,10 @@ mkheaders()
 
 static int
 emitcnt(head)
-	register struct nvlist *head;
+	struct nvlist *head;
 {
-	register struct nvlist *nv;
-	register FILE *fp;
+	struct nvlist *nv;
+	FILE *fp;
 	int cnt;
 	char nam[100];
 	char buf[BUFSIZ];
@@ -199,9 +199,9 @@ err(what, fname, fp)
 
 static char *
 cntname(src)
-	register const char *src;
+	const char *src;
 {
-	register char *dst, c;
+	char *dst, c;
 	static char buf[100];
 
 	dst = buf;
diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c
index ad08c5174e8..f9820531396 100644
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkioconf.c,v 1.18 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: mkioconf.c,v 1.19 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: mkioconf.c,v 1.41 1996/11/11 14:18:49 mycroft Exp $	*/
 
 /*
@@ -76,7 +76,7 @@ static int emitroots(FILE *);
 int
 mkioconf()
 {
-	register FILE *fp;
+	FILE *fp;
 	int v;
 
 	qsort(packed, npacked, sizeof *packed, cforder);
@@ -105,7 +105,7 @@ static int
 cforder(a, b)
 	const void *a, *b;
 {
-	register int n1, n2;
+	int n1, n2;
 
 	n1 = (*(struct devi **)a)->i_cfindex;
 	n2 = (*(struct devi **)b)->i_cfindex;
@@ -114,10 +114,10 @@ cforder(a, b)
 
 static int
 emithdr(ofp)
-	register FILE *ofp;
+	FILE *ofp;
 {
-	register FILE *ifp;
-	register size_t n;
+	FILE *ifp;
+	size_t n;
 	char ifn[200], buf[BUFSIZ];
 
 	if (fprintf(ofp, "\
@@ -150,10 +150,10 @@ emithdr(ofp)
 
 static int
 emitexterns(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct devbase *d;
-	register struct deva *da;
+	struct devbase *d;
+	struct deva *da;
 
 	NEWLINE;
 	for (d = allbases; d != NULL; d = d->d_next) {
@@ -177,9 +177,9 @@ emitexterns(fp)
 
 static int
 emitloc(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register int i;
+	int i;
 
 	if (fprintf(fp, "\n/* locators */\n\
 static int loc[%d] = {", locators.used) < 0)
@@ -239,11 +239,11 @@ addlocnami(index)
  */
 static int
 emitlocnames(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct devi **p, *i;
-	register struct nvlist *nv;
-	register struct attr *a;
+	struct devi **p, *i;
+	struct nvlist *nv;
+	struct attr *a;
 	int added, start;
 	int v, j, x;
 
@@ -324,9 +324,9 @@ emitlocnames(fp)
  */
 static int
 emitpv(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register int i;
+	int i;
 
 	if (fprintf(fp, "\n/* size of parent vectors */\n\
 int pv_size = %d;\n", parents.used) < 0)
@@ -345,13 +345,13 @@ short pv[%d] = {", parents.used) < 0)
  */
 static int
 emitcfdata(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct devi **p, *i, **par;
-	register int unit, v;
-	register const char *vs, *state, *basename, *attachment;
-	register struct nvlist *nv;
-	register struct attr *a;
+	struct devi **p, *i, **par;
+	int unit, v;
+	const char *vs, *state, *basename, *attachment;
+	struct nvlist *nv;
+	struct attr *a;
 	char *loc;
 	char locbuf[20];
 
@@ -429,9 +429,9 @@ struct cfdata cfdata[] = {\n\
  */
 static int
 emitroots(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct devi **p, *i;
+	struct devi **p, *i;
 	int cnt = 0;
 
 	if (fputs("\nshort cfroots[] = {\n", fp) < 0)
@@ -460,10 +460,10 @@ emitroots(fp)
  */
 static int
 emitpseudo(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct devi *i;
-	register struct devbase *d;
+	struct devi *i;
+	struct devbase *d;
 	int cnt = 0;
 
 	if (fputs("\n/* pseudo-devices */\n", fp) < 0)
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 1e6ea16bb0a..505d7d10969 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkmakefile.c,v 1.10 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: mkmakefile.c,v 1.11 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $	*/
 
 /*
@@ -72,10 +72,10 @@ static int emitload(FILE *);
 int
 mkmakefile()
 {
-	register FILE *ifp, *ofp;
-	register int lineno;
-	register int (*fn)(FILE *);
-	register char *ifname;
+	FILE *ifp, *ofp;
+	int lineno;
+	int (*fn)(FILE *);
+	char *ifname;
 	char line[BUFSIZ], buf[200];
 
 	(void)sprintf(buf, "arch/%s/conf/Makefile.%s", machine, machine);
@@ -155,7 +155,7 @@ bad:
  */
 static const char *
 srcpath(fi)
-	register struct files *fi;
+	struct files *fi;
 {
 #if 1
 	/* Always have source, don't support object dirs for kernel builds. */
@@ -176,10 +176,10 @@ srcpath(fi)
 
 static int
 emitdefs(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct nvlist *nv;
-	register char *sp;
+	struct nvlist *nv;
+	char *sp;
 
 	if (fputs("IDENT=", fp) < 0)
 		return (1);
@@ -224,11 +224,11 @@ emitdefs(fp)
 
 static int
 emitobjs(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct files *fi;
-	register struct objects *oi;
-	register int lpos, len, sp;
+	struct files *fi;
+	struct objects *oi;
+	int lpos, len, sp;
 
 	if (fputs("OBJS=", fp) < 0)
 		return (1);
@@ -287,13 +287,13 @@ emitsfiles(fp)
 
 static int
 emitfiles(fp, suffix)
-	register FILE *fp;
+	FILE *fp;
 	int suffix;
 {
-	register struct files *fi;
-	register struct config *cf;
-	register int lpos, len, sp;
-	register const char *fpath;
+	struct files *fi;
+	struct config *cf;
+	int lpos, len, sp;
+	const char *fpath;
 	char swapname[100];
 
 	if (fprintf(fp, "%cFILES=", toupper(suffix)) < 0)
@@ -359,10 +359,10 @@ emitfiles(fp, suffix)
  */
 static int
 emitrules(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct files *fi;
-	register const char *cp, *fpath;
+	struct files *fi;
+	const char *cp, *fpath;
 	int ch;
 	char buf[200];
 
@@ -395,10 +395,10 @@ emitrules(fp)
  */
 static int
 emitload(fp)
-	register FILE *fp;
+	FILE *fp;
 {
-	register struct config *cf;
-	register const char *nm, *swname;
+	struct config *cf;
+	const char *nm, *swname;
 	int first;
 
 	if (fputs("all:", fp) < 0)
diff --git a/usr.sbin/config/mkswap.c b/usr.sbin/config/mkswap.c
index 7b7367858d4..67de13c4ca4 100644
--- a/usr.sbin/config/mkswap.c
+++ b/usr.sbin/config/mkswap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkswap.c,v 1.8 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: mkswap.c,v 1.9 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: mkswap.c,v 1.5 1996/08/31 20:58:27 mycroft Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ static int mkoneswap(struct config *);
 int
 mkswap()
 {
-	register struct config *cf;
+	struct config *cf;
 
 	for (cf = allcf; cf != NULL; cf = cf->cf_next)
 		if (cf->cf_root != NULL && mkoneswap(cf))
@@ -84,10 +84,10 @@ dev_t d;
 
 static int
 mkoneswap(cf)
-	register struct config *cf;
+	struct config *cf;
 {
-	register struct nvlist *nv;
-	register FILE *fp;
+	struct nvlist *nv;
+	FILE *fp;
 	char fname[200];
 	char *mountroot;
 
diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c
index cf589f93143..95ae8f8a122 100644
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pack.c,v 1.10 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: pack.c,v 1.11 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: pack.c,v 1.5 1996/08/31 21:15:11 mycroft Exp $	*/
 
 /*
@@ -122,8 +122,8 @@ static void resettails(void);
 void
 pack()
 {
-	register struct devi *i;
-	register int n;
+	struct devi *i;
+	int n;
 
 	/* Pack instances and make parent vectors. */
 	packdevi();
@@ -165,9 +165,9 @@ pack()
 void
 packdevi()
 {
-	register struct devi *i, *l, *p;
-	register struct deva *d;
-	register int j, m, n;
+	struct devi *i, *l, *p;
+	struct deva *d;
+	int j, m, n;
 
 	packed = emalloc((ndevi + 1) * sizeof *packed);
 	n = 0;
@@ -217,9 +217,9 @@ packdevi()
  */
 static int
 sameas(i1, i2)
-	register struct devi *i1, *i2;
+	struct devi *i1, *i2;
 {
-	register const char **p1, **p2;
+	const char **p1, **p2;
 
 	if (i1->i_atattr != i2->i_atattr)
 		return (0);
@@ -237,11 +237,11 @@ sameas(i1, i2)
  */
 static void
 addparents(src, dst)
-	register struct devi *src, *dst;
+	struct devi *src, *dst;
 {
-	register struct nvlist *nv;
-	register struct devi *i, **p, **q;
-	register int j, n, old, new, ndup;
+	struct nvlist *nv;
+	struct devi *i, **p, **q;
+	int j, n, old, new, ndup;
 
 	if (dst->i_collapsed)
 		panic("addparents() i_collapsed");
@@ -302,12 +302,12 @@ addparents(src, dst)
  */
 static int
 nparents(p, dev, unit)
-	register struct devi **p;
-	register struct devbase *dev;
-	register int unit;
+	struct devi **p;
+	struct devbase *dev;
+	int unit;
 {
-	register struct devi *i, *l;
-	register int n;
+	struct devi *i, *l;
+	int n;
 
 	n = 0;
 	/* for each instance ... */
@@ -328,8 +328,8 @@ nparents(p, dev, unit)
 static void
 packlocs()
 {
-	register struct devi **p, *i;
-	register int l, o;
+	struct devi **p, *i;
+	int l, o;
 
 	qsort(packed, npacked, sizeof *packed, loclencmp);
 	for (p = packed; (i = *p) != NULL; p++) {
@@ -346,9 +346,9 @@ packlocs()
 static void
 packpvec()
 {
-	register struct devi **p, *i, **par;
-	register int l, v, o;
-	register short *vec;
+	struct devi **p, *i, **par;
+	int l, v, o;
+	short *vec;
 
 	vec = emalloc(longest_pvec * sizeof(*vec));
 	qsort(packed, npacked, sizeof *packed, pvlencmp);
@@ -381,8 +381,8 @@ findvec(ptr, hash, len, cmp, nextplace)
 	vec_cmp_func cmp;
 	int nextplace;
 {
-	register struct tails *t, **hp;
-	register int off;
+	struct tails *t, **hp;
+	int off;
 
 	hp = &tails[hash];
 	for (t = *hp; t != NULL; t = t->t_next) {
@@ -404,9 +404,9 @@ static int
 samelocs(ptr, off, len)
 	const void *ptr;
 	int off;
-	register int len;
+	int len;
 {
-	register const char **p, **q;
+	const char **p, **q;
 
 	for (p = &locators.vec[off], q = (const char **)ptr; --len >= 0;)
 		if (*p++ != *q++)
@@ -419,11 +419,11 @@ samelocs(ptr, off, len)
  */
 static int
 addlocs(locs, len)
-	register const char **locs;
-	register int len;
+	const char **locs;
+	int len;
 {
-	register const char **p;
-	register int ret;
+	const char **p;
+	int ret;
 
 	ret = locators.used;
 	if ((locators.used = ret + len) > locspace)
@@ -441,7 +441,7 @@ static int
 loclencmp(a, b)
 	const void *a, *b;
 {
-	register int l1, l2;
+	int l1, l2;
 
 	l1 = (*(struct devi **)a)->i_atattr->a_loclen;
 	l2 = (*(struct devi **)b)->i_atattr->a_loclen;
@@ -455,9 +455,9 @@ static int
 samepv(ptr, off, len)
 	const void *ptr;
 	int off;
-	register int len;
+	int len;
 {
-	register short *p, *q;
+	short *p, *q;
 
 	for (p = &parents.vec[off], q = (short *)ptr; --len >= 0;)
 		if (*p++ != *q++)
@@ -470,11 +470,11 @@ samepv(ptr, off, len)
  */
 static int
 addpv(pv, len)
-	register short *pv;
-	register int len;
+	short *pv;
+	int len;
 {
-	register short *p;
-	register int ret;
+	short *p;
+	int ret;
 	static int firstend = -1;
 
 	/*
@@ -505,7 +505,7 @@ static int
 pvlencmp(a, b)
 	const void *a, *b;
 {
-	register int l1, l2;
+	int l1, l2;
 
 	l1 = (*(struct devi **)a)->i_pvlen;
 	l2 = (*(struct devi **)b)->i_pvlen;
@@ -515,8 +515,8 @@ pvlencmp(a, b)
 static void
 resettails()
 {
-	register struct tails **p, *t, *next;
-	register int i;
+	struct tails **p, *t, *next;
+	int i;
 
 	for (p = tails, i = TAILHSIZE; --i >= 0; p++) {
 		for (t = *p; t != NULL; t = next) {
diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c
index 009516850b2..cabbb8f6caf 100644
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sem.c,v 1.24 2002/02/17 19:42:35 millert Exp $	*/
+/*	$OpenBSD: sem.c,v 1.25 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: sem.c,v 1.10 1996/11/11 23:40:11 gwr Exp $	*/
 
 /*
@@ -129,7 +129,7 @@ extern const char *lastfile;
 void
 enddefs()
 {
-	register struct devbase *dev;
+	struct devbase *dev;
 
 	for (dev = allbases; dev != NULL; dev = dev->d_next) {
 		if (!dev->d_isdef) {
@@ -187,9 +187,9 @@ defattr(name, locs)
 	const char *name;
 	struct nvlist *locs;
 {
-	register struct attr *a;
-	register struct nvlist *nv;
-	register int len;
+	struct attr *a;
+	struct nvlist *nv;
+	int len;
 
 	a = emalloc(sizeof *a);
 	if (ht_insert(attrtab, name, a)) {
@@ -222,8 +222,8 @@ defattr(name, locs)
  */
 static int
 has_errobj(nv, obj)
-	register struct nvlist *nv;
-	register void *obj;
+	struct nvlist *nv;
+	void *obj;
 {
 
 	for (; nv != NULL; nv = nv->nv_next)
@@ -239,10 +239,10 @@ has_errobj(nv, obj)
  */
 static struct nvlist *
 addtoattr(l, dev)
-	register struct nvlist *l;
-	register struct devbase *dev;
+	struct nvlist *l;
+	struct devbase *dev;
 {
-	register struct nvlist *n;
+	struct nvlist *n;
 
 	n = newnv(NULL, NULL, dev, 0, l);
 	return (n);
@@ -254,12 +254,12 @@ addtoattr(l, dev)
  */
 void
 defdev(dev, ispseudo, loclist, attrs)
-	register struct devbase *dev;
+	struct devbase *dev;
 	int ispseudo;
 	struct nvlist *loclist, *attrs;
 {
-	register struct nvlist *nv;
-	register struct attr *a;
+	struct nvlist *nv;
+	struct attr *a;
 
 	if (dev == &errdev)
 		goto bad;
@@ -314,8 +314,8 @@ struct devbase *
 getdevbase(name)
 	const char *name;
 {
-	register u_char *p;
-	register struct devbase *dev;
+	u_char *p;
+	struct devbase *dev;
 
 	p = (u_char *)name;
 	if (!isalpha(*p))
@@ -356,13 +356,13 @@ badname:
  */
 void
 defdevattach(deva, dev, atlist, attrs)
-	register struct deva *deva;
+	struct deva *deva;
 	struct devbase *dev;
 	struct nvlist *atlist, *attrs;
 {
-	register struct nvlist *nv;
-	register struct attr *a;
-	register struct deva *da;
+	struct nvlist *nv;
+	struct attr *a;
+	struct deva *da;
 
 	if (dev == &errdev)
 		goto bad;
@@ -449,8 +449,8 @@ struct deva *
 getdevattach(name)
 	const char *name;
 {
-	register u_char *p;
-	register struct deva *deva;
+	u_char *p;
+	struct deva *deva;
 
 	p = (u_char *)name;
 	if (!isalpha(*p))
@@ -539,15 +539,15 @@ exclude(nv, name, what)
  */
 static int
 resolve(nvp, name, what, dflt, part)
-	register struct nvlist **nvp;
+	struct nvlist **nvp;
 	const char *name, *what;
 	struct nvlist *dflt;
-	register int part;
+	int part;
 {
-	register struct nvlist *nv;
-	register struct devbase *dev;
-	register const char *cp;
-	register int maj, min, l;
+	struct nvlist *nv;
+	struct devbase *dev;
+	const char *cp;
+	int maj, min, l;
 	int unit;
 	char buf[NAMESIZE];
 
@@ -622,7 +622,7 @@ resolve(nvp, name, what, dflt, part)
 
 static int
 lresolve(nvp, name, what, dflt, part)
-	register struct nvlist **nvp;
+	struct nvlist **nvp;
 	const char *name, *what;
 	struct nvlist *dflt;
 	int part;
@@ -640,10 +640,10 @@ lresolve(nvp, name, what, dflt, part)
  */
 void
 addconf(cf0)
-	register struct config *cf0;
+	struct config *cf0;
 {
-	register struct config *cf;
-	register struct nvlist *nv;
+	struct config *cf;
+	struct nvlist *nv;
 	const char *name;
 
 	name = cf0->cf_name;
@@ -693,7 +693,7 @@ bad:
 
 void
 setconf(npp, what, v)
-	register struct nvlist **npp;
+	struct nvlist **npp;
 	const char *what;
 	struct nvlist *v;
 {
@@ -711,7 +711,7 @@ newdevi(name, unit, d)
 	int unit;
 	struct devbase *d;
 {
-	register struct devi *i;
+	struct devi *i;
 
 	i = emalloc(sizeof *i);
 	i->i_name = name;
@@ -794,12 +794,12 @@ adddev(name, at, loclist, flags, disable)
 	struct nvlist *loclist;
 	int flags, disable;
 {
-	register struct devi *i;	/* the new instance */
-	register struct attr *attr;	/* attribute that allows attach */
-	register struct devbase *ib;	/* i->i_base */
-	register struct devbase *ab;	/* not NULL => at another dev */
-	register struct nvlist *nv;
-	register struct deva *iba;	/* devbase attachment used */
+	struct devi *i;	/* the new instance */
+	struct attr *attr;	/* attribute that allows attach */
+	struct devbase *ib;	/* i->i_base */
+	struct devbase *ab;	/* not NULL => at another dev */
+	struct nvlist *nv;
+	struct deva *iba;	/* devbase attachment used */
 	const char *cp;
 	int atunit;
 	char atbuf[NAMESIZE];
@@ -931,8 +931,8 @@ addpseudo(name, number)
 	const char *name;
 	int number;
 {
-	register struct devbase *d;
-	register struct devi *i;
+	struct devbase *d;
+	struct devi *i;
 
 	d = ht_lookup(devbasetab, name);
 	if (d == NULL) {
@@ -964,8 +964,8 @@ static struct devi *
 getdevi(name)
 	const char *name;
 {
-	register struct devi *i, *firsti;
-	register struct devbase *d;
+	struct devi *i, *firsti;
+	struct devbase *d;
 	int unit;
 	char base[NAMESIZE];
 
@@ -1042,14 +1042,14 @@ wildref(name)
  */
 static int
 split(name, nlen, base, bsize, aunit)
-	register const char *name;
+	const char *name;
 	size_t nlen;
 	char *base;
 	size_t bsize;
 	int *aunit;
 {
-	register const char *cp;
-	register int c;
+	const char *cp;
+	int c;
 	size_t l;
 
 	l = nlen;
@@ -1080,11 +1080,11 @@ split(name, nlen, base, bsize, aunit)
  */
 static void
 selectbase(d, da)
-	register struct devbase *d;
-	register struct deva *da;
+	struct devbase *d;
+	struct deva *da;
 {
-	register struct attr *a;
-	register struct nvlist *nv;
+	struct attr *a;
+	struct nvlist *nv;
 
 	(void)ht_insert(selecttab, d->d_name, (char *)d->d_name);
 	for (nv = d->d_attrs; nv != NULL; nv = nv->nv_next) {
@@ -1106,8 +1106,8 @@ selectbase(d, da)
  */
 static int
 onlist(nv, ptr)
-	register struct nvlist *nv;
-	register void *ptr;
+	struct nvlist *nv;
+	void *ptr;
 {
 	for (; nv != NULL; nv = nv->nv_next)
 		if (nv->nv_ptr == ptr)
@@ -1117,10 +1117,10 @@ onlist(nv, ptr)
 
 static char *
 extend(p, name)
-	register char *p;
+	char *p;
 	const char *name;
 {
-	register int l;
+	int l;
 
 	l = strlen(name);
 	bcopy(name, p, l);
@@ -1137,12 +1137,12 @@ extend(p, name)
 static const char **
 fixloc(name, attr, got)
 	const char *name;
-	register struct attr *attr;
-	register struct nvlist *got;
+	struct attr *attr;
+	struct nvlist *got;
 {
-	register struct nvlist *m, *n;
-	register int ord;
-	register const char **lp;
+	struct nvlist *m, *n;
+	int ord;
+	const char **lp;
 	int nmissing, nextra, nnodefault;
 	char *mp, *ep, *ndp;
 	char missing[1000], extra[1000], nodefault[1000];
diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c
index 02171718044..3489c3c8eae 100644
--- a/usr.sbin/config/util.c
+++ b/usr.sbin/config/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.8 2002/02/19 19:39:40 millert Exp $	*/
+/*	$OpenBSD: util.c,v 1.9 2002/03/14 16:44:24 mpech Exp $	*/
 /*	$NetBSD: util.c,v 1.5 1996/08/31 20:58:29 mycroft Exp $	*/
 
 /*
@@ -100,7 +100,7 @@ char *
 sourcepath(file)
 	const char *file;
 {
-	register char *cp;
+	char *cp;
 
 	cp = emalloc(strlen(srcdir) + 1 + strlen(file) + 1);
 	(void)sprintf(cp, "%s/%s", srcdir, file);
@@ -116,7 +116,7 @@ newnv(name, str, ptr, i, next)
 	int i;
 	struct nvlist *next;
 {
-	register struct nvlist *nv;
+	struct nvlist *nv;
 
 	if ((nv = nvhead) == NULL)
 		nv = emalloc(sizeof(*nv));
@@ -140,7 +140,7 @@ newnv(name, str, ptr, i, next)
  */
 void
 nvfree(nv)
-	register struct nvlist *nv;
+	struct nvlist *nv;
 {
 
 	nv->nv_next = nvhead;
@@ -152,9 +152,9 @@ nvfree(nv)
  */
 void
 nvfreel(nv)
-	register struct nvlist *nv;
+	struct nvlist *nv;
 {
-	register struct nvlist *next;
+	struct nvlist *next;
 
 	for (; nv != NULL; nv = next) {
 		next = nv->nv_next;
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c
index 09108830f65..d24a1bee139 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.c
+++ b/usr.sbin/dev_mkdb/dev_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_mkdb.c,v 1.6 2002/02/16 21:28:01 millert Exp $	*/
+/*	$OpenBSD: dev_mkdb.c,v 1.7 2002/03/14 16:44:24 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)dev_mkdb.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$Id: dev_mkdb.c,v 1.6 2002/02/16 21:28:01 millert Exp $";
+static char rcsid[] = "$Id: dev_mkdb.c,v 1.7 2002/03/14 16:44:24 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -67,8 +67,8 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register DIR *dirp;
-	register struct dirent *dp;
+	DIR *dirp;
+	struct dirent *dp;
 	struct stat sb;
 	struct {
 		mode_t type;
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 98bbe23c108..ce500e4a3d2 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)edquota.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: edquota.c,v 1.29 2002/02/16 21:28:01 millert Exp $";
+static char *rcsid = "$Id: edquota.c,v 1.30 2002/03/14 16:44:24 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -244,8 +244,8 @@ getprivs(id, quotatype)
 	u_int id;
 	int quotatype;
 {
-	register struct fstab *fs;
-	register struct quotause *qup, *quptail;
+	struct fstab *fs;
+	struct quotause *qup, *quptail;
 	struct quotause *quphead;
 	int qcmd, qupsize, fd;
 	u_int mid;
@@ -335,7 +335,7 @@ putprivs(id, quotatype, quplist)
 	int quotatype;
 	struct quotause *quplist;
 {
-	register struct quotause *qup;
+	struct quotause *qup;
 	int qcmd, fd;
 
 	qcmd = QCMD(Q_SETQUOTA, quotatype);
@@ -425,7 +425,7 @@ writeprivs(quplist, outfd, name, quotatype)
 	char *name;
 	int quotatype;
 {
-	register struct quotause *qup;
+	struct quotause *qup;
 	FILE *fd;
 
 	ftruncate(outfd, 0);
@@ -455,10 +455,10 @@ readprivs(quplist, infd)
 	struct quotause *quplist;
 	int infd;
 {
-	register struct quotause *qup;
+	struct quotause *qup;
 	FILE *fd;
 	int cnt;
-	register char *cp;
+	char *cp;
 	struct dqblk dqblk;
 	char *fsp, line1[BUFSIZ], line2[BUFSIZ];
 
@@ -567,7 +567,7 @@ writetimes(quplist, outfd, quotatype)
 	int outfd;
 	int quotatype;
 {
-	register struct quotause *qup;
+	struct quotause *qup;
 	char *cvtstoa();
 	FILE *fd;
 
@@ -598,10 +598,10 @@ readtimes(quplist, infd)
 	struct quotause *quplist;
 	int infd;
 {
-	register struct quotause *qup;
+	struct quotause *qup;
 	FILE *fd;
 	int cnt;
-	register char *cp;
+	char *cp;
 	time_t itime, btime, iseconds, bseconds;
 	char *fsp, bunits[10], iunits[10], line1[BUFSIZ];
 
@@ -722,7 +722,7 @@ void
 freeprivs(quplist)
 	struct quotause *quplist;
 {
-	register struct quotause *qup, *nextqup;
+	struct quotause *qup, *nextqup;
 
 	for (qup = quplist; qup; qup = nextqup) {
 		nextqup = qup->next;
@@ -756,7 +756,7 @@ hasquota(fs, type, qfnamep)
 	int type;
 	char **qfnamep;
 {
-	register char *opt;
+	char *opt;
 	char *cp;
 	static char initname, usrname[100], grpname[100];
 	static char buf[BUFSIZ];
diff --git a/usr.sbin/fdformat/fdformat.c b/usr.sbin/fdformat/fdformat.c
index ec83e0c109d..ff160cb56d9 100644
--- a/usr.sbin/fdformat/fdformat.c
+++ b/usr.sbin/fdformat/fdformat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdformat.c,v 1.9 2000/06/30 16:00:25 millert Exp $	*/
+/*	$OpenBSD: fdformat.c,v 1.10 2002/03/14 16:44:24 mpech Exp $	*/
 
 /*
  * Copyright (C) 1992-1994 by Joerg Wunsch, Dresden
@@ -62,7 +62,7 @@ format_track(fd, cyl, secs, head, rate, gaplen, secsize, fill, interleave)
 	int fill, interleave;
 {
 	struct fd_formb f;
-	register int i,j;
+	int i,j;
 	int il[FD_MAX_NSEC + 1];
 
 	memset(il,0,sizeof il);
diff --git a/usr.sbin/grfinfo/grfinfo.c b/usr.sbin/grfinfo/grfinfo.c
index 1f67677944c..58e29c3b871 100644
--- a/usr.sbin/grfinfo/grfinfo.c
+++ b/usr.sbin/grfinfo/grfinfo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: grfinfo.c,v 1.3 1997/02/03 05:10:59 downsj Exp $	*/
+/*	$OpenBSD: grfinfo.c,v 1.4 2002/03/14 16:44:24 mpech Exp $	*/
 
 /* 
  * Copyright (c) 1987-1993, The University of Utah and
@@ -52,7 +52,7 @@ main(argc, argv)
 {
 	extern int optind, optopt;
 	extern char *optarg;
-	register int c;
+	int c;
 
 	pname = argv[0];
 	while ((c = getopt(argc, argv, "at")) != -1)
@@ -115,7 +115,7 @@ printall()
 char *
 tname()
 {
-	register struct grf_info *gp;
+	struct grf_info *gp;
 
 	for (gp = info; gp->grf_id >= 0; gp++)
 		if (gi.gd_id == gp->grf_id)
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 1669e5d8244..957d65e1137 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inetd.c,v 1.88 2002/02/16 21:28:03 millert Exp $	*/
+/*	$OpenBSD: inetd.c,v 1.89 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $	*/
 /*
  * Copyright (c) 1983,1991 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)inetd.c	5.30 (Berkeley) 6/3/91";*/
-static char rcsid[] = "$OpenBSD: inetd.c,v 1.88 2002/02/16 21:28:03 millert Exp $";
+static char rcsid[] = "$OpenBSD: inetd.c,v 1.89 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -327,10 +327,10 @@ main(argc, argv, envp)
 {
 	extern char *optarg;
 	extern int optind;
-	register struct servtab *sep;
-	register struct passwd *pwd;
-	register struct group *grp = NULL;
-	register int tmpint;
+	struct servtab *sep;
+	struct passwd *pwd;
+	struct group *grp = NULL;
+	int tmpint;
 	struct sigaction sa, sapipe;
 	int ch, dofork;
 	pid_t pid;
@@ -732,7 +732,7 @@ doreap(void)
 {
 	pid_t pid;
 	int status;
-	register struct servtab *sep;
+	struct servtab *sep;
 
 	if (debug)
 		fprintf(stderr, "reaping asked for\n");
@@ -785,7 +785,7 @@ config(int sig)
 void
 doconfig(void)
 {
-	register struct servtab *sep, *cp, **sepp;
+	struct servtab *sep, *cp, **sepp;
 	int n, add;
 	char protoname[10];
 	sigset_t omask;
@@ -1014,7 +1014,7 @@ retry(int sig)
 void
 doretry(void)
 {
-	register struct servtab *sep;
+	struct servtab *sep;
 
 	timingout = 0;
 	for (sep = servtab; sep; sep = sep->se_next) {
@@ -1041,7 +1041,7 @@ die(int sig)
 void
 dodie(void)
 {
-	register struct servtab *sep;
+	struct servtab *sep;
 
 	for (sep = servtab; sep; sep = sep->se_next) {
 		if (sep->se_fd == -1)
@@ -1067,7 +1067,7 @@ int bump_nofile(void);
 
 void
 setup(sep)
-	register struct servtab *sep;
+	struct servtab *sep;
 {
 	int on = 1;
 	int r;
@@ -1141,7 +1141,7 @@ setsockopt(fd, SOL_SOCKET, opt, (char *)&on, sizeof (on))
 
 void
 register_rpc(sep)
-	register struct servtab *sep;
+	struct servtab *sep;
 {
 	int n;
 	struct sockaddr_in sin;
@@ -1175,7 +1175,7 @@ register_rpc(sep)
 
 void
 unregister_rpc(sep)
-	register struct servtab *sep;
+	struct servtab *sep;
 {
 	int n;
 
@@ -1194,7 +1194,7 @@ struct servtab *
 enter(cp)
 	struct servtab *cp;
 {
-	register struct servtab *sep;
+	struct servtab *sep;
 	sigset_t omask;
 
 	sep = (struct servtab *)malloc(sizeof (*sep));
@@ -1289,7 +1289,7 @@ endconfig()
 struct servtab *
 getconfigent()
 {
-	register struct servtab *sep;
+	struct servtab *sep;
 	int argc;
 	char *cp, *arg, *s;
 	char *hostdelim;
@@ -1585,7 +1585,7 @@ skip:
 
 void
 freeconfig(cp)
-	register struct servtab *cp;
+	struct servtab *cp;
 {
 	int i;
 
@@ -1713,7 +1713,7 @@ inetd_setproctitle(a, s)
 	int s;
 {
 	int size;
-	register char *cp;
+	char *cp;
 	struct sockaddr_in sin;
 	char buf[80];
 
@@ -1855,7 +1855,7 @@ char *endring;
 void
 initring()
 {
-	register int i;
+	int i;
 
 	endring = ring;
 
@@ -1870,7 +1870,7 @@ chargen_stream(s, sep)		/* Character generator */
 	int s;
 	struct servtab *sep;
 {
-	register char *rs;
+	char *rs;
 	int len;
 	char text[LINESIZ+2];
 
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index d923d6b79a5..a4f227448b9 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iostat.c,v 1.12 2002/02/16 21:28:03 millert Exp $	*/
+/*	$OpenBSD: iostat.c,v 1.13 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $	*/
 
 /*
@@ -214,7 +214,7 @@ sigheader(signo)
 static void
 header(void)
 {
-	register int i;
+	int i;
 
 	/* Main Headers. */
 	if (ISSET(todo, SHOW_TTY))
@@ -260,7 +260,7 @@ static void
 disk_stats(etime)
 double etime;
 {
-	register int dn;
+	int dn;
 	double atime, mbps;
 
 	for (dn = 0; dn < dk_ndrive; ++dn) {
@@ -294,7 +294,7 @@ static void
 disk_stats2(etime)
 double etime;
 {
-	register int dn;
+	int dn;
 	double atime;
 
 	for (dn = 0; dn < dk_ndrive; ++dn) {
@@ -317,7 +317,7 @@ double etime;
 static void
 cpustats()
 {
-	register int state;
+	int state;
 	double time;
 
 	time = 0;
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 84de6aa9a39..14acdad3956 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgmon.c,v 1.8 2002/03/14 06:51:42 mpech Exp $	*/
+/*	$OpenBSD: kgmon.c,v 1.9 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*
  * Copyright (c) 1983, 1992, 1993
@@ -41,7 +41,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)kgmon.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: kgmon.c,v 1.8 2002/03/14 06:51:42 mpech Exp $";
+static char *rcsid = "$OpenBSD: kgmon.c,v 1.9 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -302,7 +302,7 @@ void
 dumpstate(kvp)
 	struct kvmvars *kvp;
 {
-	register FILE *fp;
+	FILE *fp;
 	struct rawarc rawarc;
 	struct tostruct *tos;
 	u_long frompc;
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index e3d02aa8c34..580f1a1876a 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlist.c,v 1.24 2002/02/20 23:07:49 pefo Exp $	*/
+/*	$OpenBSD: nlist.c,v 1.25 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "from: @(#)nlist.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: nlist.c,v 1.24 2002/02/20 23:07:49 pefo Exp $";
+static char *rcsid = "$OpenBSD: nlist.c,v 1.25 2002/03/14 16:44:25 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -88,7 +88,7 @@ __aout_knlist(fd, db, ksyms)
 	DB *db;
 	int ksyms;
 {
-	register int nsyms;
+	int nsyms;
 	struct exec ebuf;
 	FILE *fp;
 	NLIST nbuf;
@@ -295,11 +295,11 @@ __elf_knlist(fd, db, ksyms)
 	DB *db;
 	int ksyms;
 {
-	register caddr_t strtab;
-	register off_t symstroff, symoff;
-	register u_long symsize;
-	register u_long kernvma, kernoffs;
-	register int i;
+	caddr_t strtab;
+	off_t symstroff, symoff;
+	u_long symsize;
+	u_long kernvma, kernoffs;
+	int i;
 	Elf_Sym sbuf;
 	size_t symstrsize;
 	char *shstr, buf[1024];
diff --git a/usr.sbin/kvm_mkdb/testdb.c b/usr.sbin/kvm_mkdb/testdb.c
index 6b5cd804f81..34eacbe34d1 100644
--- a/usr.sbin/kvm_mkdb/testdb.c
+++ b/usr.sbin/kvm_mkdb/testdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: testdb.c,v 1.3 1998/08/19 06:47:55 millert Exp $	*/
+/*	$OpenBSD: testdb.c,v 1.4 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "from: @(#)testdb.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: testdb.c,v 1.3 1998/08/19 06:47:55 millert Exp $";
+static char *rcsid = "$OpenBSD: testdb.c,v 1.4 2002/03/14 16:44:25 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,8 +59,8 @@ int
 testdb(dbname)
 	char *dbname;
 {
-	register DB *db;
-	register int cc, kd, ret, dbversionlen;
+	DB *db;
+	int cc, kd, ret, dbversionlen;
 	DBT rec;
 	struct nlist nitem;
 	char dbversion[_POSIX2_LINE_MAX];
diff --git a/usr.sbin/mopd/common/cmp.c b/usr.sbin/mopd/common/cmp.c
index b7f77d792ec..1903adacede 100644
--- a/usr.sbin/mopd/common/cmp.c
+++ b/usr.sbin/mopd/common/cmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmp.c,v 1.3 1996/09/21 19:11:19 maja Exp $ */
+/*	$OpenBSD: cmp.c,v 1.4 2002/03/14 16:44:25 mpech Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,14 +30,14 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: cmp.c,v 1.3 1996/09/21 19:11:19 maja Exp $";
+static char rcsid[] = "$OpenBSD: cmp.c,v 1.4 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 #include "os.h"
 
 int
 mopCmpEAddr(addr1, addr2)
-	register u_char *addr1, *addr2;
+	u_char *addr1, *addr2;
 {
         return(bcmp((char *)addr1, (char *)addr2, 6));
 }
diff --git a/usr.sbin/mopd/common/get.c b/usr.sbin/mopd/common/get.c
index 8c4e407582b..70fcf4350b2 100644
--- a/usr.sbin/mopd/common/get.c
+++ b/usr.sbin/mopd/common/get.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get.c,v 1.2 1996/09/21 19:11:35 maja Exp $ */
+/*	$OpenBSD: get.c,v 1.3 2002/03/14 16:44:25 mpech Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: get.c,v 1.2 1996/09/21 19:11:35 maja Exp $";
+static char rcsid[] = "$OpenBSD: get.c,v 1.3 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 #include <sys/types.h>
@@ -38,8 +38,8 @@ static char rcsid[] = "$OpenBSD: get.c,v 1.2 1996/09/21 19:11:35 maja Exp $";
 
 u_char
 mopGetChar(pkt, index)
-	register u_char *pkt;
-	register int    *index;
+	u_char *pkt;
+	int    *index;
 {
         u_char ret;
 
@@ -50,8 +50,8 @@ mopGetChar(pkt, index)
 
 u_short
 mopGetShort(pkt, index)
-	register u_char *pkt;
-	register int    *index;
+	u_char *pkt;
+	int    *index;
 {
         u_short ret;
 	
@@ -62,8 +62,8 @@ mopGetShort(pkt, index)
 
 u_long
 mopGetLong(pkt, index)
-	register u_char *pkt;
-	register int    *index;
+	u_char *pkt;
+	int    *index;
 {
         u_long ret;
 	
@@ -77,8 +77,8 @@ mopGetLong(pkt, index)
 
 void
 mopGetMulti(pkt, index, dest, size)
-	register u_char *pkt,*dest;
-	register int    *index,size;
+	u_char *pkt,*dest;
+	int    *index,size;
 {
 	int i;
 
diff --git a/usr.sbin/mopd/common/loop-bsd.c b/usr.sbin/mopd/common/loop-bsd.c
index 7e308d774dc..f67383a8826 100644
--- a/usr.sbin/mopd/common/loop-bsd.c
+++ b/usr.sbin/mopd/common/loop-bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loop-bsd.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */
+/*	$OpenBSD: loop-bsd.c,v 1.6 2002/03/14 16:44:25 mpech Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.5 2002/02/16 21:28:04 millert Exp $";
+static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.6 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 #include <stdlib.h>
@@ -169,7 +169,7 @@ Loop()
 			bp = buf;
 			ep = bp + cc;
 			while (bp < ep) {
-				register int caplen, hdrlen;
+				int caplen, hdrlen;
 
 				caplen = bhp->bh_caplen;
 				hdrlen = bhp->bh_hdrlen;
diff --git a/usr.sbin/mopd/common/put.c b/usr.sbin/mopd/common/put.c
index 5de00468928..c4be4b0a817 100644
--- a/usr.sbin/mopd/common/put.c
+++ b/usr.sbin/mopd/common/put.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: put.c,v 1.2 1996/09/21 19:12:01 maja Exp $ */
+/*	$OpenBSD: put.c,v 1.3 2002/03/14 16:44:25 mpech Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: put.c,v 1.2 1996/09/21 19:12:01 maja Exp $";
+static char rcsid[] = "$OpenBSD: put.c,v 1.3 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 #include <stddef.h>
@@ -40,8 +40,8 @@ static char rcsid[] = "$OpenBSD: put.c,v 1.2 1996/09/21 19:12:01 maja Exp $";
 
 void
 mopPutChar(pkt, index, value)
-	register u_char *pkt;
-	register int    *index;
+	u_char *pkt;
+	int    *index;
 	u_char   value;
 {
 	pkt[*index] = value;
@@ -50,8 +50,8 @@ mopPutChar(pkt, index, value)
 
 void
 mopPutShort(pkt, index, value)
-	register u_char *pkt;
-	register int    *index;
+	u_char *pkt;
+	int    *index;
 	u_short  value;
 {
         int i;
@@ -64,8 +64,8 @@ mopPutShort(pkt, index, value)
 
 void
 mopPutLong(pkt, index, value)
-	register u_char *pkt;
-	register int    *index;
+	u_char *pkt;
+	int    *index;
 	u_long   value;
 {
         int i;
@@ -78,8 +78,8 @@ mopPutLong(pkt, index, value)
 
 void
 mopPutMulti(pkt, index, value, size)
-	register u_char *pkt,*value;
-	register int    *index,size;
+	u_char *pkt,*value;
+	int    *index,size;
 {
 	int i;
 
@@ -91,8 +91,8 @@ mopPutMulti(pkt, index, value, size)
 
 void
 mopPutTime(pkt, index, value)
-	register u_char *pkt;
-	register int    *index;
+	u_char *pkt;
+	int    *index;
 	time_t value;
 {
 	time_t tnow;
@@ -121,8 +121,8 @@ mopPutTime(pkt, index, value)
 
 void
 mopPutHeader(pkt, index, dst, src, proto, trans)
-	register u_char *pkt;
-	register int    *index;
+	u_char *pkt;
+	int    *index;
 	char	 dst[], src[];
 	u_short	 proto;
 	int	 trans;
@@ -158,7 +158,7 @@ mopPutHeader(pkt, index, dst, src, proto, trans)
 
 void
 mopPutLength(pkt, trans, len)
-	register u_char *pkt;
+	u_char *pkt;
 	int	 trans;
 	u_short	 len;
 {
diff --git a/usr.sbin/mopd/otherOS/pf-snit.c b/usr.sbin/mopd/otherOS/pf-snit.c
index 329e0edeafd..5414b2c01d7 100644
--- a/usr.sbin/mopd/otherOS/pf-snit.c
+++ b/usr.sbin/mopd/otherOS/pf-snit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf-snit.c,v 1.3 2000/02/20 17:45:34 bitblt Exp $ */
+/*	$OpenBSD: pf-snit.c,v 1.4 2002/03/14 16:44:25 mpech Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: pf-snit.c,v 1.3 2000/02/20 17:45:34 bitblt Exp $";
+static char rcsid[] = "$OpenBSD: pf-snit.c,v 1.4 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 #include <stdio.h>
@@ -167,7 +167,7 @@ setup_pf(s, prot, trans)
 	u_short offset;
 
 	struct packetfilt pf;
-	register u_short *fwp = pf.Pf_Filter;
+	u_short *fwp = pf.Pf_Filter;
 	struct strioctl si;
 
 #define	s_offset(structp, element) (&(((structp)0)->element))
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 4ef751fa23b..d18daf90b62 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: compare.c,v 1.11 1996/09/05 09:56:48 mycroft Exp $	*/
-/*	$OpenBSD: compare.c,v 1.14 2002/02/16 21:28:05 millert Exp $	*/
+/*	$OpenBSD: compare.c,v 1.15 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: compare.c,v 1.14 2002/02/16 21:28:05 millert Exp $";
+static const char rcsid[] = "$OpenBSD: compare.c,v 1.15 2002/03/14 16:44:25 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -85,8 +85,8 @@ static char *ftype(u_int);
 int
 compare(name, s, p)
 	char *name;
-	register NODE *s;
-	register FTSENT *p;
+	NODE *s;
+	FTSENT *p;
 {
 	u_int32_t len, val;
 	int fd, label;
@@ -400,7 +400,7 @@ rlink(name)
 	char *name;
 {
 	static char lbuf[MAXPATHLEN];
-	register int len;
+	int len;
 
 	if ((len = readlink(name, lbuf, sizeof(lbuf)-1)) == -1)
 		error("%s: %s", name, strerror(errno));
diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c
index cf410e441c5..65ae8060094 100644
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $	*/
-/*	$OpenBSD: create.c,v 1.16 2002/03/09 18:49:09 millert Exp $	*/
+/*	$OpenBSD: create.c,v 1.17 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: create.c,v 1.16 2002/03/09 18:49:09 millert Exp $";
+static const char rcsid[] = "$OpenBSD: create.c,v 1.17 2002/03/14 16:44:25 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -82,8 +82,8 @@ static void	statf(int, FTSENT *);
 void
 cwalk()
 {
-	register FTS *t;
-	register FTSENT *p;
+	FTS *t;
+	FTSENT *p;
 	time_t clock;
 	char *argv[2], host[MAXHOSTNAMELEN];
 	int indent = 0;
@@ -264,10 +264,10 @@ statd(t, parent, puid, pgid, pmode)
 	gid_t *pgid;
 	mode_t *pmode;
 {
-	register FTSENT *p;
-	register gid_t sgid;
-	register uid_t suid;
-	register mode_t smode;
+	FTSENT *p;
+	gid_t sgid;
+	uid_t suid;
+	mode_t smode;
 	struct group *gr;
 	struct passwd *pw;
 	gid_t savegid = *pgid;
diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c
index 84a29526bc5..8f65aed927d 100644
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: spec.c,v 1.6 1995/03/07 21:12:12 cgd Exp $	*/
-/*	$OpenBSD: spec.c,v 1.14 2002/03/09 18:49:09 millert Exp $	*/
+/*	$OpenBSD: spec.c,v 1.15 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: spec.c,v 1.14 2002/03/09 18:49:09 millert Exp $";
+static const char rcsid[] = "$OpenBSD: spec.c,v 1.15 2002/03/14 16:44:25 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -63,8 +63,8 @@ static void	 unset(char *, NODE *);
 NODE *
 spec()
 {
-	register NODE *centry, *last;
-	register char *p;
+	NODE *centry, *last;
+	char *p;
 	NODE ginfo, *root;
 	int c_cur, c_next;
 	char buf[2048];
@@ -173,9 +173,9 @@ noparent:		error("no parent node");
 static void
 set(t, ip)
 	char *t;
-	register NODE *ip;
+	NODE *ip;
 {
-	register int type;
+	int type;
 	char *kw, *val = NULL;
 	struct group *gr;
 	struct passwd *pw;
@@ -309,9 +309,9 @@ set(t, ip)
 static void
 unset(t, ip)
 	char *t;
-	register NODE *ip;
+	NODE *ip;
 {
-	register char *p;
+	char *p;
 
 	while ((p = strtok(t, "\n\t ")))
 		ip->flags &= ~parsekey(p, NULL);
diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c
index a864fda9326..63ddf7e855b 100644
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: verify.c,v 1.10 2002/03/09 18:54:19 millert Exp $	*/
+/*	$OpenBSD: verify.c,v 1.11 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: verify.c,v 1.10 1995/03/07 21:26:28 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static const char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: verify.c,v 1.10 2002/03/09 18:54:19 millert Exp $";
+static const char rcsid[] = "$OpenBSD: verify.c,v 1.11 2002/03/14 16:44:25 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -78,9 +78,9 @@ verify()
 static int
 vwalk()
 {
-	register FTS *t;
-	register FTSENT *p;
-	register NODE *ep, *level;
+	FTS *t;
+	FTSENT *p;
+	NODE *ep, *level;
 	int specdepth, rval;
 	char *argv[2];
 
@@ -158,11 +158,11 @@ extra:
 
 static void
 miss(p, tail)
-	register NODE *p;
-	register char *tail;
+	NODE *p;
+	char *tail;
 {
-	register int create;
-	register char *tp;
+	int create;
+	char *tp;
 
 	for (; p; p = p->next) {
 		if ((p->flags & F_OPT) && !(p->flags & F_VISIT))
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index e8a53478797..328e5f72ec3 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portmap.c,v 1.20 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: portmap.c,v 1.21 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved.
@@ -44,7 +44,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)portmap.c	5.4 (Berkeley) 4/19/91";
 #else
-static char rcsid[] = "$OpenBSD: portmap.c,v 1.20 2002/02/16 21:28:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: portmap.c,v 1.21 2002/03/14 16:44:25 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -124,7 +124,7 @@ main(argc, argv)
 	struct sockaddr_in addr, laddr;
 	int on = 1;
 	int len = sizeof(struct sockaddr_in);
-	register struct pmaplist *pml;
+	struct pmaplist *pml;
 
 	while ((c = getopt(argc, argv, "d")) != -1) {
 		switch (c) {
@@ -260,8 +260,8 @@ struct pmaplist *
 find_service(prog, vers, prot)
 	u_long prog, vers, prot;
 {
-	register struct pmaplist *hit = NULL;
-	register struct pmaplist *pml;
+	struct pmaplist *hit = NULL;
+	struct pmaplist *pml;
 
 	for (pml = pmaplist; pml != NULL; pml = pml->pml_next) {
 		if ((pml->pml_map.pm_prog != prog) ||
@@ -502,8 +502,8 @@ struct rmtcallargs {
 
 static bool_t
 xdr_rmtcall_args(xdrs, cap)
-	register XDR *xdrs;
-	register struct rmtcallargs *cap;
+	XDR *xdrs;
+	struct rmtcallargs *cap;
 {
 
 	/* does not get a port number */
@@ -517,8 +517,8 @@ xdr_rmtcall_args(xdrs, cap)
 
 static bool_t
 xdr_rmtcall_result(xdrs, cap)
-	register XDR *xdrs;
-	register struct rmtcallargs *cap;
+	XDR *xdrs;
+	struct rmtcallargs *cap;
 {
 	if (xdr_u_long(xdrs, &(cap->rmt_port)))
 		return (xdr_encap_parms(xdrs, &(cap->rmt_args)));
@@ -544,10 +544,10 @@ xdr_opaque_parms(xdrs, cap)
  */
 static bool_t
 xdr_len_opaque_parms(xdrs, cap)
-	register XDR *xdrs;
+	XDR *xdrs;
 	struct rmtcallargs *cap;
 {
-	register u_int beginpos, lowpos, highpos, currpos, pos;
+	u_int beginpos, lowpos, highpos, currpos, pos;
 
 	beginpos = lowpos = pos = xdr_getpos(xdrs);
 	highpos = lowpos + ARGSIZE;
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index d1f0305a5c4..ce2c59a8a77 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pstat.c,v 1.29 2002/02/16 21:28:07 millert Exp $	*/
+/*	$OpenBSD: pstat.c,v 1.30 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 from: static char sccsid[] = "@(#)pstat.c	8.9 (Berkeley) 2/16/94";
 #else
-static char *rcsid = "$OpenBSD: pstat.c,v 1.29 2002/02/16 21:28:07 millert Exp $";
+static char *rcsid = "$OpenBSD: pstat.c,v 1.30 2002/03/14 16:44:25 mpech Exp $";
 #endif
 #endif /* not lint */
 
@@ -230,9 +230,9 @@ struct e_vnode {
 void
 vnodemode()
 {
-	register struct e_vnode *e_vnodebase, *endvnode, *evp;
-	register struct vnode *vp;
-	register struct mount *maddr, *mp = NULL;
+	struct e_vnode *e_vnodebase, *endvnode, *evp;
+	struct vnode *vp;
+	struct mount *maddr, *mp = NULL;
 	int numvnodes;
 
 	e_vnodebase = loadvnodes(&numvnodes);
@@ -297,7 +297,7 @@ vnode_print(avnode, vp)
 {
 	char *type, flags[16]; 
 	char *fp = flags;
-	register int flag;
+	int flag;
 
 	/*
 	 * set type
@@ -367,7 +367,7 @@ int
 ufs_print(vp) 
 	struct vnode *vp;
 {
-	register int flag;
+	int flag;
 	struct inode inode, *ip = &inode;
 	char flagbuf[16], *flags = flagbuf;
 	char *name;
@@ -425,7 +425,7 @@ int
 ext2fs_print(vp) 
 	struct vnode *vp;
 {
-	register int flag;
+	int flag;
 	struct inode inode, *ip = &inode;
 	char flagbuf[16], *flags = flagbuf;
 
@@ -473,7 +473,7 @@ nfs_print(vp)
 {
 	struct nfsnode nfsnode, *np = &nfsnode;
 	char flagbuf[16], *flags = flagbuf;
-	register int flag;
+	int flag;
 	char *name;
 	mode_t type;
 
@@ -524,7 +524,7 @@ getmnt(maddr)
 		struct mount *maddr;
 		struct mount mount;
 	} *mhead = NULL;
-	register struct mtab *mt;
+	struct mtab *mt;
 
 	for (mt = mhead; mt != NULL; mt = mt->next)
 		if (maddr == mt->maddr)
@@ -542,7 +542,7 @@ void
 mount_print(mp)
 	struct mount *mp;
 {
-	register int flags;
+	int flags;
 
 #define ST	mp->mnt_stat
 	(void)printf("*** MOUNT ");
@@ -813,9 +813,9 @@ struct {
 
 void
 ttyprt(tp)
-	register struct tty *tp;
+	struct tty *tp;
 {
-	register int i, j;
+	int i, j;
 	pid_t pgid;
 	char *name, state[20];
 
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index c45f140d979..1b95735b6f9 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)quotaon.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: quotaon.c,v 1.11 2001/07/27 20:34:36 pvalchev Exp $";
+static char *rcsid = "$Id: quotaon.c,v 1.12 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -68,7 +68,7 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register struct fstab *fs;
+	struct fstab *fs;
 	char *qfnp, *whoami;
 	long argnum, done = 0;
 	int i, offmode = 0, errs = 0;
@@ -157,7 +157,7 @@ usage(whoami)
 }
 
 quotaonoff(fs, offmode, type, qfpathname)
-	register struct fstab *fs;
+	struct fstab *fs;
 	int offmode, type;
 	char *qfpathname;
 {
@@ -189,10 +189,10 @@ quotaonoff(fs, offmode, type, qfpathname)
  * Check to see if target appears in list of size cnt.
  */
 oneof(target, list, cnt)
-	register char *target, *list[];
+	char *target, *list[];
 	int cnt;
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < cnt; i++)
 		if (strcmp(target, list[i]) == 0)
@@ -204,12 +204,12 @@ oneof(target, list, cnt)
  * Check to see if a particular quota is to be enabled.
  */
 hasquota(fs, type, qfnamep, force)
-	register struct fstab *fs;
+	struct fstab *fs;
 	int type;
 	char **qfnamep;
 	int force;
 {
-	register char *opt;
+	char *opt;
 	char *cp;
 	static char initname, usrname[100], grpname[100];
 	static char buf[BUFSIZ];
@@ -244,7 +244,7 @@ hasquota(fs, type, qfnamep, force)
  * MFS is special -- it puts "mfs:" in the kernel's mount table
  */
 readonly(fs)
-	register struct fstab *fs;
+	struct fstab *fs;
 {
 	struct statfs fsbuf;
 
diff --git a/usr.sbin/rarpd/arptab.c b/usr.sbin/rarpd/arptab.c
index de88496e9b6..2edc7663792 100644
--- a/usr.sbin/rarpd/arptab.c
+++ b/usr.sbin/rarpd/arptab.c
@@ -107,9 +107,9 @@ arptab_set(eaddr, host)
 	u_char *eaddr;
 	u_int32_t host;
 {
-	register struct sockaddr_inarp *sin = &sin_m;
-	register struct sockaddr_dl *sdl;
-	register struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
+	struct sockaddr_inarp *sin = &sin_m;
+	struct sockaddr_dl *sdl;
+	struct rt_msghdr *rtm = &(m_rtmsg.m_rtm);
 	struct timeval time;
 	int rt;
 
@@ -183,9 +183,9 @@ rtmsg(cmd)
 {
 	static int seq;
 	int rlen;
-	register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
-	register char *cp = m_rtmsg.m_space;
-	register int l;
+	struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
+	char *cp = m_rtmsg.m_space;
+	int l;
 
 	errno = 0;
 	if (cmd == RTM_DELETE)
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index ffc2815b1b5..484c5c0c370 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.34 2002/02/19 19:39:40 millert Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.35 2002/03/14 16:44:25 mpech Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -28,7 +28,7 @@ char    copyright[] =
 #endif				/* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rarpd.c,v 1.34 2002/02/19 19:39:40 millert Exp $";
+static char rcsid[] = "$OpenBSD: rarpd.c,v 1.35 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 
@@ -535,7 +535,7 @@ rarp_loop()
 			bp = buf;
 			ep = bp + cc;
 			while (bp < ep) {
-				register int caplen, hdrlen;
+				int caplen, hdrlen;
 
 				caplen = bhp->bh_caplen;
 				hdrlen = bhp->bh_hdrlen;
@@ -564,8 +564,8 @@ int
 rarp_bootable(addr)
 	u_int32_t  addr;
 {
-	register struct dirent *dent;
-	register DIR *d;
+	struct dirent *dent;
+	DIR *d;
 	char    ipname[40];
 	static DIR *dd = 0;
 
diff --git a/usr.sbin/rbootd/bpf.c b/usr.sbin/rbootd/bpf.c
index df1a31282d1..c67918cb8c2 100644
--- a/usr.sbin/rbootd/bpf.c
+++ b/usr.sbin/rbootd/bpf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpf.c,v 1.6 2002/02/19 21:04:09 miod Exp $	*/
+/*	$OpenBSD: bpf.c,v 1.7 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: bpf.c,v 1.5.2.1 1995/11/14 08:45:42 thorpej Exp $	*/
 
 /*
@@ -49,7 +49,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)bpf.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: bpf.c,v 1.6 2002/02/19 21:04:09 miod Exp $";
+static char rcsid[] = "$OpenBSD: bpf.c,v 1.7 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -319,7 +319,7 @@ BpfRead(rconn, doread)
 	RMPCONN *rconn;
 	int doread;
 {
-	register int datlen, caplen, hdrlen;
+	int datlen, caplen, hdrlen;
 	static u_int8_t *bp = NULL, *ep = NULL;
 	int cc;
 
diff --git a/usr.sbin/rbootd/parseconf.c b/usr.sbin/rbootd/parseconf.c
index db927d08f6e..feca9ddd7e3 100644
--- a/usr.sbin/rbootd/parseconf.c
+++ b/usr.sbin/rbootd/parseconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parseconf.c,v 1.5 2001/09/04 23:35:59 millert Exp $	*/
+/*	$OpenBSD: parseconf.c,v 1.6 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: parseconf.c,v 1.4 1995/10/06 05:12:16 thorpej Exp $	*/
 
 /*
@@ -49,7 +49,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)parseconf.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: parseconf.c,v 1.5 2001/09/04 23:35:59 millert Exp $";
+static char rcsid[] = "$OpenBSD: parseconf.c,v 1.6 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -88,8 +88,8 @@ ParseConfig()
 	CLIENT *client;
 	u_int8_t *addr;
 	char line[C_LINELEN];
-	register char *cp, *bcp;
-	register int i, j;
+	char *cp, *bcp;
+	int i, j;
 	int linecnt = 0;
 	sigset_t mask, omask;
 
@@ -254,9 +254,9 @@ ParseAddr(str)
 	char *str;
 {
 	static u_int8_t addr[RMP_ADDRLEN];
-	register char *cp;
-	register unsigned i;
-	register int part, subpart;
+	char *cp;
+	unsigned int i;
+	int part, subpart;
 
 	bzero((char *)&addr[0], RMP_ADDRLEN);	/* zero static buffer */
 
@@ -318,8 +318,8 @@ GetBootFiles()
 {
 	DIR *dfd;
 	struct stat statb;
-	register struct dirent *dp;
-	register int i;
+	struct dirent *dp;
+	int i;
 
 	/*
 	 *  Free the current list of boot files.
diff --git a/usr.sbin/rbootd/rbootd.c b/usr.sbin/rbootd/rbootd.c
index eda0595832e..d3a955ef925 100644
--- a/usr.sbin/rbootd/rbootd.c
+++ b/usr.sbin/rbootd/rbootd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbootd.c,v 1.12 2002/02/20 02:00:01 miod Exp $	*/
+/*	$OpenBSD: rbootd.c,v 1.13 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: rbootd.c,v 1.5 1995/10/06 05:12:17 thorpej Exp $	*/
 
 /*
@@ -55,7 +55,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)rbootd.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: rbootd.c,v 1.12 2002/02/20 02:00:01 miod Exp $";
+static char rcsid[] = "$OpenBSD: rbootd.c,v 1.13 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -327,7 +327,7 @@ main(argc, argv)
 void
 DoTimeout()
 {
-	register RMPCONN *rtmp;
+	RMPCONN *rtmp;
 	struct timeval now;
 
 	(void) gettimeofday(&now, (struct timezone *)0);
@@ -363,9 +363,9 @@ DoTimeout()
 
 CLIENT *
 FindClient(rconn)
-	register RMPCONN *rconn;
+	RMPCONN *rconn;
 {
-	register CLIENT *ctmp;
+	CLIENT *ctmp;
 
 	for (ctmp = Clients; ctmp != NULL; ctmp = ctmp->next)
 		if (bcmp((char *)&rconn->rmp.hp_hdr.saddr[0],
diff --git a/usr.sbin/rbootd/rmpproto.c b/usr.sbin/rbootd/rmpproto.c
index a43dc975b0c..b423d7da410 100644
--- a/usr.sbin/rbootd/rmpproto.c
+++ b/usr.sbin/rbootd/rmpproto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmpproto.c,v 1.6 2001/01/17 00:27:21 pjanzen Exp $	*/
+/*	$OpenBSD: rmpproto.c,v 1.7 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: rmpproto.c,v 1.5.2.1 1995/11/14 08:45:44 thorpej Exp $	*/
 
 /*
@@ -49,7 +49,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)rmpproto.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: rmpproto.c,v 1.6 2001/01/17 00:27:21 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: rmpproto.c,v 1.7 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -179,9 +179,9 @@ int
 SendServerID(rconn)
 	RMPCONN *rconn;
 {
-	register struct rmp_packet *rpl;
-	register char *src, *dst;
-	register u_int8_t *size;
+	struct rmp_packet *rpl;
+	char *src, *dst;
+	u_int8_t *size;
 
 	rpl = &rconn->rmp;			/* cache ptr to RMP packet */
 
@@ -233,10 +233,10 @@ SendFileNo(req, rconn, filelist)
 	RMPCONN *rconn;
 	char *filelist[];
 {
-	register struct rmp_packet *rpl;
-	register char *src, *dst;
-	register u_int8_t *size;
-	register int i;
+	struct rmp_packet *rpl;
+	char *src, *dst;
+	u_int8_t *size;
+	int i;
 
 	GETWORD(req->r_brpl.rmp_seqno, i);	/* SeqNo is really FileNo */
 	rpl = &rconn->rmp;			/* cache ptr to RMP packet */
@@ -299,9 +299,9 @@ SendBootRepl(req, rconn, filelist)
 	int retval;
 	char *filename, filepath[RMPBOOTDATA+1];
 	RMPCONN *oldconn;
-	register struct rmp_packet *rpl;
-	register char *src, *dst1, *dst2;
-	register u_int8_t i;
+	struct rmp_packet *rpl;
+	char *src, *dst1, *dst2;
+	u_int8_t i;
 
 	/*
 	 *  If another connection already exists, delete it since we
@@ -414,8 +414,8 @@ SendReadRepl(rconn)
 {
 	int retval = 0;
 	RMPCONN *oldconn;
-	register struct rmp_packet *rpl, *req;
-	register int size = 0;
+	struct rmp_packet *rpl, *req;
+	int size = 0;
 	int madeconn = 0;
 
 	/*
@@ -576,7 +576,7 @@ BootDone(rconn)
 */
 int
 SendPacket(rconn)
-	register RMPCONN *rconn;
+	RMPCONN *rconn;
 {
 	/*
 	 *  Set Ethernet Destination address to Source (BPF and the enet
diff --git a/usr.sbin/rbootd/utils.c b/usr.sbin/rbootd/utils.c
index 1c71e68a048..ad8c0d14c18 100644
--- a/usr.sbin/rbootd/utils.c
+++ b/usr.sbin/rbootd/utils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utils.c,v 1.4 2001/01/17 00:33:04 pjanzen Exp $	*/
+/*	$OpenBSD: utils.c,v 1.5 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$NetBSD: utils.c,v 1.5.2.1 1995/11/14 08:45:46 thorpej Exp $	*/
 
 /*
@@ -49,7 +49,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)utils.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$OpenBSD: utils.c,v 1.4 2001/01/17 00:33:04 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: utils.c,v 1.5 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -86,7 +86,7 @@ DispPkt(rconn, direct)
 	static char ReadFmt[] = "\t\tRetCode:%u Offset:%lx SessID:%x\n";
 
 	struct tm *tmp;
-	register struct rmp_packet *rmp;
+	struct rmp_packet *rmp;
 	int i, omask;
 	u_int32_t t;
 
@@ -212,8 +212,8 @@ GetEtherAddr(addr)
 {
 	static char Hex[] = "0123456789abcdef";
 	static char etherstr[RMP_ADDRLEN*3];
-	register int i;
-	register char *cp;
+	int i;
+	char *cp;
 
 	/*
 	 *  For each byte in `addr', convert it to "<hexchar><hexchar>:".
@@ -249,10 +249,10 @@ GetEtherAddr(addr)
 */
 void
 DspFlnm(size, flnm)
-	register u_int size;
-	register char *flnm;
+	u_int size;
+	char *flnm;
 {
-	register int i;
+	int i;
 
 	(void) fprintf(DbgFp, "\n\t\tFile Name (%u): <", size);
 	for (i = 0; i < size; i++)
@@ -310,7 +310,7 @@ NewClient(addr)
 void
 FreeClients()
 {
-	register CLIENT *ctmp;
+	CLIENT *ctmp;
 
 	while (Clients != NULL) {
 		ctmp = Clients;
@@ -410,7 +410,7 @@ NewConn(rconn)
 */
 void
 FreeConn(rtmp)
-	register RMPCONN *rtmp;
+	RMPCONN *rtmp;
 {
 	/*
 	 *  If the file descriptor is in use, close the file.
@@ -446,7 +446,7 @@ FreeConn(rtmp)
 void
 FreeConns()
 {
-	register RMPCONN *rtmp;
+	RMPCONN *rtmp;
 
 	while (RmpConns != NULL) {
 		rtmp = RmpConns;
@@ -477,7 +477,7 @@ FreeConns()
 */
 void
 AddConn(rconn)
-	register RMPCONN *rconn;
+	RMPCONN *rconn;
 {
 	if (RmpConns != NULL)
 		rconn->next = RmpConns;
@@ -505,9 +505,9 @@ AddConn(rconn)
 */
 RMPCONN *
 FindConn(rconn)
-	register RMPCONN *rconn;
+	RMPCONN *rconn;
 {
-	register RMPCONN *rtmp;
+	RMPCONN *rtmp;
 
 	for (rtmp = RmpConns; rtmp != NULL; rtmp = rtmp->next)
 		if (bcmp((char *)&rconn->rmp.hp_hdr.saddr[0],
@@ -535,9 +535,9 @@ FindConn(rconn)
 */
 void
 RemoveConn(rconn)
-	register RMPCONN *rconn;
+	RMPCONN *rconn;
 {
-	register RMPCONN *thisrconn, *lastrconn;
+	RMPCONN *thisrconn, *lastrconn;
 
 	if (RmpConns == rconn) {		/* easy case */
 		RmpConns = RmpConns->next;
diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c
index 0b3c9a357b8..269bfeebecc 100644
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)repquota.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: repquota.c,v 1.15 2002/02/16 21:28:08 millert Exp $";
+static char *rcsid = "$Id: repquota.c,v 1.16 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 /*
@@ -88,9 +88,9 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	register struct fstab *fs;
-	register struct passwd *pw;
-	register struct group *gr;
+	struct fstab *fs;
+	struct passwd *pw;
+	struct group *gr;
 	int gflag = 0, uflag = 0, errs = 0;
 	long i, argnum, done = 0;
 	extern char *optarg;
@@ -177,11 +177,11 @@ usage()
 
 int
 repquota(fs, type, qfpathname)
-	register struct fstab *fs;
+	struct fstab *fs;
 	int type;
 	char *qfpathname;
 {
-	register struct fileusage *fup;
+	struct fileusage *fup;
 	FILE *qf;
 	uid_t id;
 	struct dqblk dqbuf;
@@ -261,10 +261,10 @@ repquota(fs, type, qfpathname)
  */
 int
 oneof(target, list, cnt)
-	register char *target, *list[];
+	char *target, *list[];
 	int cnt;
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < cnt; i++)
 		if (strcmp(target, list[i]) == 0)
@@ -277,11 +277,11 @@ oneof(target, list, cnt)
  */
 int
 hasquota(fs, type, qfnamep)
-	register struct fstab *fs;
+	struct fstab *fs;
 	int type;
 	char **qfnamep;
 {
-	register char *opt;
+	char *opt;
 	char *cp;
 	static char initname, usrname[100], grpname[100];
 	static char buf[BUFSIZ];
@@ -324,7 +324,7 @@ lookup(id, type)
 	uid_t id;
 	int type;
 {
-	register struct fileusage *fup;
+	struct fileusage *fup;
 
 	for (fup = fuhead[type][id & (FUHASH-1)]; fup != 0; fup = fup->fu_next)
 		if (fup->fu_id == id)
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c
index aac38b00b9c..1a97ed18fcf 100644
--- a/usr.sbin/rtadvd/advcap.c
+++ b/usr.sbin/rtadvd/advcap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advcap.c,v 1.5 2002/02/16 21:28:08 millert Exp $	*/
+/*	$OpenBSD: advcap.c,v 1.6 2002/03/14 16:44:25 mpech Exp $	*/
 /*	$KAME: advcap.c,v 1.5 2001/02/01 09:12:08 jinmei Exp $	*/
 
 /*
@@ -120,8 +120,8 @@ int
 getent(bp, name, cp)
 	char *bp, *name, *cp;
 {
-	register int c;
-	register int i = 0, cnt = 0;
+	int c;
+	int i = 0, cnt = 0;
 	char ibuf[BUFSIZ];
 	int tf;
 
@@ -189,7 +189,7 @@ getent(bp, name, cp)
 int
 tnchktc()
 {
-	register char *p, *q;
+	char *p, *q;
 	char tcname[16];	/* name of similar terminal */
 	char tcbuf[BUFSIZ];
 	char *holdtbuf = tbuf;
@@ -239,7 +239,7 @@ int
 tnamatch(np)
 	char *np;
 {
-	register char *Np, *Bp;
+	char *Np, *Bp;
 
 	Bp = tbuf;
 	if (*Bp == '#')
@@ -264,7 +264,7 @@ tnamatch(np)
  */
 static char *
 tskip(bp)
-	register char *bp;
+	char *bp;
 {
 	int dquote;
 
@@ -311,9 +311,9 @@ long long
 tgetnum(id)
 	char *id;
 {
-	register long long i;
-	register int base;
-	register char *bp = tbuf;
+	long long i;
+	int base;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -347,7 +347,7 @@ int
 tgetflag(id)
 	char *id;
 {
-	register char *bp = tbuf;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -375,7 +375,7 @@ char *
 tgetstr(id, area)
 	char *id, **area;
 {
-	register char *bp = tbuf;
+	char *bp = tbuf;
 
 	for (;;) {
 		bp = tskip(bp);
@@ -399,12 +399,12 @@ tgetstr(id, area)
  */
 static char *
 tdecode(str, area)
-	register char *str;
+	char *str;
 	char **area;
 {
-	register char *cp;
-	register int c;
-	register char *dp;
+	char *cp;
+	int c;
+	char *dp;
 	int i;
 	char term;
 
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index b510317ab67..b05b5347860 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: rwhod.c,v 1.21 2002/02/17 19:42:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: rwhod.c,v 1.22 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -316,7 +316,7 @@ handleread(s)
  */
 int
 verify(p)
-	register char *p;
+	char *p;
 {
 	char c;
 
@@ -351,9 +351,9 @@ int	alarmcount;
 void
 timer()
 {
-	register struct neighbor *np;
-	register struct whoent *we = mywd.wd_we, *wlast;
-	register int i;
+	struct neighbor *np;
+	struct whoent *we = mywd.wd_we, *wlast;
+	int i;
 	struct stat stb;
 	double avenrun[3];
 	time_t now;
@@ -467,11 +467,11 @@ quit(msg)
 
 void
 rt_xaddrs(cp, cplim, rtinfo)
-	register caddr_t cp, cplim;
-	register struct rt_addrinfo *rtinfo;
+	caddr_t cp, cplim;
+	struct rt_addrinfo *rtinfo;
 {
-	register struct sockaddr *sa;
-	register int i;
+	struct sockaddr *sa;
+	int i;
 
 	memset(rtinfo->rti_info, 0, sizeof(rtinfo->rti_info));
 	for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) {
@@ -490,9 +490,9 @@ int
 configure(s)
 	int s;
 {
-	register struct neighbor *np;
-	register struct if_msghdr *ifm;
-	register struct ifa_msghdr *ifam;
+	struct neighbor *np;
+	struct if_msghdr *ifm;
+	struct ifa_msghdr *ifam;
 	struct sockaddr_dl *sdl;
 	size_t needed;
 	int mib[6], flags = 0, len;
@@ -571,8 +571,8 @@ Sendto(s, buf, cc, flags, to, tolen)
 	const struct sockaddr *to;
 	socklen_t tolen;
 {
-	register struct whod *w = (struct whod *)buf;
-	register struct whoent *we;
+	struct whod *w = (struct whod *)buf;
+	struct whoent *we;
 	struct sockaddr_in *sin = (struct sockaddr_in *)to;
 	int ret;
 
diff --git a/usr.sbin/timed/timed/cksum.c b/usr.sbin/timed/timed/cksum.c
index 3442c69563e..b5172fbc6a6 100644
--- a/usr.sbin/timed/timed/cksum.c
+++ b/usr.sbin/timed/timed/cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cksum.c,v 1.2 2001/04/07 20:00:15 ho Exp $	*/
+/*	$OpenBSD: cksum.c,v 1.3 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)cksum.c	5.2 (Berkeley) 5/11/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.2 $"
+#ident "$Revision: 1.3 $"
 #endif
 
 #include <sys/types.h>
@@ -57,10 +57,10 @@ static char sccsid[] = "@(#)cksum.c	5.2 (Berkeley) 5/11/93";
 int
 in_cksum(u_short *addr, int len)
 {
-	register int nleft = len;
-	register u_short *w = addr;
-	register u_short answer;
-	register int sum = 0;
+	int nleft = len;
+	u_short *w = addr;
+	u_short answer;
+	int sum = 0;
 
 	/*
 	 *  Our algorithm is simple, using a 32 bit accumulator (sum),
diff --git a/usr.sbin/timed/timed/measure.c b/usr.sbin/timed/timed/measure.c
index 7d633b0db02..092a5bd7fca 100644
--- a/usr.sbin/timed/timed/measure.c
+++ b/usr.sbin/timed/timed/measure.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: measure.c,v 1.5 2001/11/23 03:45:51 deraadt Exp $	*/
+/*	$OpenBSD: measure.c,v 1.6 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)measure.c	5.1 (Berkeley) 5/11/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.5 $"
+#ident "$Revision: 1.6 $"
 #endif
 
 #include "globals.h"
@@ -82,8 +82,8 @@ measure(u_long maxmsec,			/* wait this many msec at most */
 	long min_idelta, min_odelta;
 	struct timeval tdone, tcur, ttrans, twait, tout;
 	u_char packet[PACKET_IN], opacket[64];
-	register struct icmp *icp = (struct icmp *) packet;
-	register struct icmp *oicp = (struct icmp *) opacket;
+	struct icmp *icp = (struct icmp *) packet;
+	struct icmp *oicp = (struct icmp *) opacket;
 	struct ip *ip = (struct ip *) packet;
 
 	min_idelta = min_odelta = 0x7fffffff;
diff --git a/usr.sbin/timed/timed/readmsg.c b/usr.sbin/timed/timed/readmsg.c
index 7dfee3216a5..30bfe72a8f6 100644
--- a/usr.sbin/timed/timed/readmsg.c
+++ b/usr.sbin/timed/timed/readmsg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readmsg.c,v 1.8 2001/05/05 05:10:04 mickey Exp $	*/
+/*	$OpenBSD: readmsg.c,v 1.9 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)readmsg.c	5.1 (Berkeley) 5/11/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.8 $"
+#ident "$Revision: 1.9 $"
 #endif
 
 #include "globals.h"
@@ -85,8 +85,8 @@ readmsg(int type, char *machfrom, struct timeval *intvl,
 	static struct tsplist *tail = &msgslist;
 	static int msgcnt = 0;
 	struct tsplist *prev;
-	register struct netinfo *ntp;
-	register struct tsplist *ptr;
+	struct netinfo *ntp;
+	struct tsplist *ptr;
 	ssize_t n;
 
 	if (trace) {
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index bd8f9fee141..1763e81447a 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timed.c,v 1.13 2002/02/19 18:57:42 mpech Exp $	*/
+/*	$OpenBSD: timed.c,v 1.14 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)timed.c	5.1 (Berkeley) 5/11/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.13 $"
+#ident "$Revision: 1.14 $"
 #endif /* sgi */
 
 #define TSPTYPES
@@ -147,7 +147,7 @@ main(int argc, char **argv)
 	char *inbuf = NULL, *cp, *cplim;
 	struct ifconf ifc;
 	struct ifreq ifreq, ifreqf, *ifr;
-	register struct netinfo *ntp;
+	struct netinfo *ntp;
 	struct netinfo *ntip;
 	struct netinfo *savefromnet;
 	struct netent *nentp;
@@ -783,7 +783,7 @@ setstatus()
 void
 makeslave(struct netinfo *net)
 {
-	register struct netinfo *ntp;
+	struct netinfo *ntp;
 
 	for (ntp = nettab; ntp != NULL; ntp = ntp->next) {
 		if (ntp->status == SLAVE && ntp != net)
@@ -798,7 +798,7 @@ makeslave(struct netinfo *net)
 static void
 checkignorednets(void)
 {
-	register struct netinfo *ntp;
+	struct netinfo *ntp;
 
 	for (ntp = nettab; ntp != NULL; ntp = ntp->next) {
 		if (!Mflag && ntp->status == SLAVE)
@@ -869,7 +869,7 @@ date()
 void
 addnetname(char *name)
 {
-	register struct nets **netlist = &nets;
+	struct nets **netlist = &nets;
 
 	while (*netlist)
 		netlist = &((*netlist)->next);
@@ -887,8 +887,8 @@ static void
 add_good_host(const char* name,
 	      char perm)		/* 1=not part of the netgroup */
 {
-	register struct goodhost *ghp;
-	register struct hostent *hentp;
+	struct goodhost *ghp;
+	struct hostent *hentp;
 
 	ghp = (struct goodhost*)malloc(sizeof(*ghp));
 	if (!ghp) {
@@ -982,8 +982,8 @@ int					/* 1=trust hp to change our date */
 good_host_name(name)
 	char *name;
 {
-	register struct goodhost *ghp = goodhosts;
-	register char c;
+	struct goodhost *ghp = goodhosts;
+	char c;
 
 	if (!ghp || !Mflag)		/* trust everyone if no one named */
 		return 1;
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c
index c5a73169c67..cc776ac82e9 100644
--- a/usr.sbin/timed/timedc/cmds.c
+++ b/usr.sbin/timed/timedc/cmds.c
@@ -1,4 +1,4 @@
-/*	$Id: cmds.c,v 1.12 2002/01/19 00:32:04 mickey Exp $	*/
+/*	$Id: cmds.c,v 1.13 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)cmds.c	5.1 (Berkeley) 5/11/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.12 $"
+#ident "$Revision: 1.13 $"
 #endif
 
 #include "timedc.h"
@@ -188,8 +188,8 @@ clockdiff(argc, argv)
 	char *argv[];
 {
 	struct servent *sp;
-	register long avg;
-	register int avg_cnt;
+	long avg;
+	int avg_cnt;
 	extern int measure(u_long, u_long, char *, struct sockaddr_in *, int);
 	int measure_status;
 
diff --git a/usr.sbin/timed/timedc/timedc.c b/usr.sbin/timed/timedc/timedc.c
index 11af4240679..ffe7a2d2e9c 100644
--- a/usr.sbin/timed/timedc/timedc.c
+++ b/usr.sbin/timed/timedc/timedc.c
@@ -1,4 +1,4 @@
-/*	$Id: timedc.c,v 1.6 2002/01/19 00:32:04 mickey Exp $	*/
+/*	$Id: timedc.c,v 1.7 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -44,7 +44,7 @@ static char sccsid[] = "@(#)timedc.c	5.1 (Berkeley) 5/11/93";
 #endif /* not lint */
 
 #ifdef sgi
-#ident "$Revision: 1.6 $"
+#ident "$Revision: 1.7 $"
 #endif
 
 #include "timedc.h"
@@ -69,7 +69,7 @@ volatile sig_atomic_t gotintr;
 int
 main(int argc, char *argv[])
 {
-	register struct cmd *c;
+	struct cmd *c;
 
 	openlog("timedc", LOG_ODELAY, LOG_AUTH);
 
@@ -157,9 +157,9 @@ sigintr(signo)
 static struct cmd *
 getcmd(char *name)
 {
-	register char *p, *q;
-	register struct cmd *c, *found;
-	register int nmatches, longest;
+	char *p, *q;
+	struct cmd *c, *found;
+	int nmatches, longest;
 	extern struct cmd cmdtab[];
 	extern int NCMDS;
 
@@ -191,8 +191,8 @@ getcmd(char *name)
 void
 makeargv()
 {
-	register char *cp;
-	register char **argp = margv;
+	char *cp;
+	char **argp = margv;
 
 	margc = 0;
 	for (cp = cmdline; *cp;) {
@@ -221,11 +221,11 @@ help(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register struct cmd *c;
+	struct cmd *c;
 	extern struct cmd cmdtab[];
 
 	if (argc == 1) {
-		register int i, j, w;
+		int i, j, w;
 		int columns, width = 0, lines;
 		extern int NCMDS;
 
@@ -259,7 +259,7 @@ help(argc, argv)
 		return;
 	}
 	while (--argc > 0) {
-		register char *arg;
+		char *arg;
 		arg = *++argv;
 		c = getcmd(arg);
 		if (c == (struct cmd *)-1)
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index de132bf04dc..77a2fc8af95 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trpt.c,v 1.11 2002/03/08 17:22:24 mickey Exp $	*/
+/*	$OpenBSD: trpt.c,v 1.12 2002/03/14 16:44:25 mpech Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -363,7 +363,7 @@ tcp_trace(act, ostate, atp, tp, ti, req)
 			printf("(win=%x)", win);
 		flags = ti->ti_flags;
 		if (flags) {
-			register char *cp = "<";
+			char *cp = "<";
 #define	pf(flag, string) { \
 	if (ti->ti_flags&flag) { \
 		(void)printf("%s%s", cp, string); \
@@ -399,8 +399,8 @@ tcp_trace(act, ostate, atp, tp, ti, req)
 	}
 	/* print out timers? */
 	if (tflag) {
-		register char *cp = "\t";
-		register int i;
+		char *cp = "\t";
+		int i;
 
 		for (i = 0; i < TCPT_NTIMERS; i++) {
 			if (timeout_pending(&tp->t_timer[i]))
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index cd0852b67c4..a2e1a7fb67f 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.42 2002/02/16 21:28:11 millert Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.43 2002/03/14 16:44:25 mpech Exp $ */
 
 /*
  * Copyright (c) 1997,1998 Theo de Raadt <deraadt@OpenBSD.org>
@@ -35,7 +35,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypbind.c,v 1.42 2002/02/16 21:28:11 millert Exp $";
+static char rcsid[] = "$OpenBSD: ypbind.c,v 1.43 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 #include <sys/param.h>
@@ -282,7 +282,7 @@ ypbindproc_setdom_2x(transp, argp, clnt)
 static void
 ypbindprog_2(rqstp, transp)
 	struct svc_req *rqstp;
-	register SVCXPRT *transp;
+	SVCXPRT *transp;
 {
 	union {
 		domainname ypbindproc_domain_2_arg;
diff --git a/usr.sbin/ypserv/common/yplog.c b/usr.sbin/ypserv/common/yplog.c
index a6647fdd64e..e704aa9b0d3 100644
--- a/usr.sbin/ypserv/common/yplog.c
+++ b/usr.sbin/ypserv/common/yplog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yplog.c,v 1.6 2002/02/19 19:39:41 millert Exp $ */
+/*	$OpenBSD: yplog.c,v 1.7 2002/03/14 16:44:25 mpech Exp $ */
 
 /*
  * Copyright (c) 1996 Charles D. Cranor
@@ -66,7 +66,7 @@ yplog(const char *fmt, ...)
 
 void
 vyplog(fmt, ap)
-	register const char *fmt;
+	const char *fmt;
 	va_list ap;
 {
         time_t t;
diff --git a/usr.sbin/ypserv/revnetgroup/hash.c b/usr.sbin/ypserv/revnetgroup/hash.c
index ace2409699c..7f5f5057a31 100644
--- a/usr.sbin/ypserv/revnetgroup/hash.c
+++ b/usr.sbin/ypserv/revnetgroup/hash.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hash.c,v 1.1 1997/04/15 22:06:11 maja Exp $ */
+/* $OpenBSD: hash.c,v 1.2 2002/03/14 16:44:25 mpech Exp $ */
 /*
  * Copyright (c) 1995
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -40,7 +40,7 @@
 #include "hash.h"
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: hash.c,v 1.1 1997/04/15 22:06:11 maja Exp $";
+static const char rcsid[] = "$OpenBSD: hash.c,v 1.2 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 /*
@@ -55,11 +55,11 @@ static const char rcsid[] = "$OpenBSD: hash.c,v 1.1 1997/04/15 22:06:11 maja Exp
 u_int32_t
 hash(keyarg, len)
 	const void *keyarg;
-	register size_t len;
+	size_t len;
 {
-	register const u_char *key;
-	register size_t loop;
-	register u_int32_t h;
+	const u_char *key;
+	size_t loop;
+	u_int32_t h;
 
 #define HASHC   h = *key++ + 65599 * h
 
diff --git a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
index 4dcafbbb4ab..2a4f62eac61 100644
--- a/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
+++ b/usr.sbin/ypserv/revnetgroup/parse_netgroup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse_netgroup.c,v 1.2 1997/08/18 03:11:35 millert Exp $ */
+/* $OpenBSD: parse_netgroup.c,v 1.3 2002/03/14 16:44:25 mpech Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -51,7 +51,7 @@
 #include "hash.h"
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: parse_netgroup.c,v 1.2 1997/08/18 03:11:35 millert Exp $";
+static const char rcsid[] = "$OpenBSD: parse_netgroup.c,v 1.3 2002/03/14 16:44:25 mpech Exp $";
 #endif
 
 /*
@@ -144,8 +144,8 @@ __getnetgrent(hostp, userp, domp)
 void
 __endnetgrent()
 {
-	register struct linelist *lp, *olp;
-	register struct netgrp *gp, *ogp;
+	struct linelist *lp, *olp;
+	struct netgrp *gp, *ogp;
 
 	lp = linehead;
 	while (lp) {
@@ -182,10 +182,10 @@ static int
 parse_netgrp(group)
 	char *group;
 {
-	register char *spos, *epos;
-	register int len, strpos;
+	char *spos, *epos;
+	int len, strpos;
 #ifdef DEBUG
-	register int fields;
+	int fields;
 #endif
 	char *pos, *gpos;
 	struct netgrp *grp;
@@ -293,8 +293,8 @@ static struct linelist *
 read_for_group(group)
 	char *group;
 {
-	register char *pos, *spos, *linep = NULL, *olinep = NULL;
-	register int len, olen;
+	char *pos, *spos, *linep = NULL, *olinep = NULL;
+	int len, olen;
 	int cont;
 	struct linelist *lp;
 	char line[LINSIZ + 1];
diff --git a/usr.sbin/ypserv/yppush/yppush_svc.c b/usr.sbin/ypserv/yppush/yppush_svc.c
index 58dee344ac1..c900176b107 100644
--- a/usr.sbin/ypserv/yppush/yppush_svc.c
+++ b/usr.sbin/ypserv/yppush/yppush_svc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush_svc.c,v 1.6 2002/02/19 19:39:41 millert Exp $ */
+/*	$OpenBSD: yppush_svc.c,v 1.7 2002/03/14 16:44:25 mpech Exp $ */
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.6 2002/02/19 19:39:41 millert Exp $";
+static char rcsid[] = "$OpenBSD: yppush_svc.c,v 1.7 2002/03/14 16:44:25 mpech Exp $";
 #endif /* not lint */
 
 #include "yppush.h"
@@ -73,7 +73,7 @@ void _msgout(msg)
 void
 yppush_xfrrespprog_1(rqstp, transp)
 	struct svc_req *rqstp;
-	register SVCXPRT *transp;
+	SVCXPRT *transp;
 {
 	union {
 		int fill;
author	mpech <mpech@openbsd.org>	2002-03-14 16:44:24 +0000
committer	mpech <mpech@openbsd.org>	2002-03-14 16:44:24 +0000
commit	0ac0d02e42d4106958da32c3dbc8eb258851b30a (patch)
tree	b3bd2e9ab5d67b121452693e317c78f627a07535
parent	split out ssh1 session key decryption; ok provos@ (diff)
download	wireguard-openbsd-0ac0d02e42d4106958da32c3dbc8eb258851b30a.tar.xz wireguard-openbsd-0ac0d02e42d4106958da32c3dbc8eb258851b30a.zip