Remove 'register' keyword.

21 files changed, 167 insertions, 167 deletions

diff --git a/lib/libstand/arp.c b/lib/libstand/arp.c
index b84fe47f4e95..59f0ce5536d5 100644
--- a/lib/libstand/arp.c
+++ b/lib/libstand/arp.c
@@ -74,12 +74,12 @@ static	ssize_t arprecv(struct iodesc *, void *, size_t, time_t);
 /* Broadcast an ARP packet, asking who has addr on interface d */
 u_char *
 arpwhohas(d, addr)
-	register struct iodesc *d;
+	struct iodesc *d;
 	struct in_addr addr;
 {
-	register int i;
-	register struct ether_arp *ah;
-	register struct arp_list *al;
+	int i;
+	struct ether_arp *ah;
+	struct arp_list *al;
 	struct {
 		struct ether_header eh;
 		struct {
@@ -152,9 +152,9 @@ arpwhohas(d, addr)
 
 static ssize_t
 arpsend(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 {
 
 #ifdef ARP_DEBUG
@@ -171,13 +171,13 @@ arpsend(d, pkt, len)
  */
 static ssize_t
 arprecv(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
 {
-	register ssize_t n;
-	register struct ether_arp *ah;
+	ssize_t n;
+	struct ether_arp *ah;
 	u_int16_t etype;	/* host order */
 
 #ifdef ARP_DEBUG
@@ -261,8 +261,8 @@ arprecv(d, pkt, len, tleft)
  */
 void
 arp_reply(d, pkt)
-	register struct iodesc *d;
-	register void *pkt;		/* the request */
+	struct iodesc *d;
+	void *pkt;		/* the request */
 {
 	struct ether_arp *arp = pkt;
 
diff --git a/lib/libstand/bootp.c b/lib/libstand/bootp.c
index 2de2f1fa891c..0a6d31034b11 100644
--- a/lib/libstand/bootp.c
+++ b/lib/libstand/bootp.c
@@ -88,7 +88,7 @@ bootp(sock, flag)
 	int flag;
 {
 	struct iodesc *d;
-	register struct bootp *bp;
+	struct bootp *bp;
 	struct {
 		u_char header[HEADER_SIZE];
 		struct bootp wbootp;
@@ -256,11 +256,11 @@ bootp(sock, flag)
 /* Transmit a bootp request */
 static ssize_t
 bootpsend(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 {
-	register struct bootp *bp;
+	struct bootp *bp;
 
 #ifdef BOOTP_DEBUG
 	if (debug)
@@ -280,13 +280,13 @@ bootpsend(d, pkt, len)
 
 static ssize_t
 bootprecv(d, pkt, len, tleft)
-register struct iodesc *d;
-register void *pkt;
-register size_t len;
+struct iodesc *d;
+void *pkt;
+size_t len;
 time_t tleft;
 {
-	register ssize_t n;
-	register struct bootp *bp;
+	ssize_t n;
+	struct bootp *bp;
 
 #ifdef BOOTP_DEBUGx
 	if (debug)
@@ -339,12 +339,12 @@ bad:
 
 static int
 vend_rfc1048(cp, len)
-	register u_char *cp;
+	u_char *cp;
 	u_int len;
 {
-	register u_char *ep;
-	register int size;
-	register u_char tag;
+	u_char *ep;
+	int size;
+	u_char tag;
 
 #ifdef BOOTP_DEBUG
 	if (debug)
@@ -400,7 +400,7 @@ static void
 vend_cmu(cp)
 	u_char *cp;
 {
-	register struct cmu_vend *vp;
+	struct cmu_vend *vp;
 
 #ifdef BOOTP_DEBUG
 	if (debug)
diff --git a/lib/libstand/ether.c b/lib/libstand/ether.c
index af26bcf9c493..1fc5ff2ed525 100644
--- a/lib/libstand/ether.c
+++ b/lib/libstand/ether.c
@@ -65,8 +65,8 @@ sendether(d, pkt, len, dea, etype)
 	u_char *dea;
 	int etype;
 {
-	register ssize_t n;
-	register struct ether_header *eh;
+	ssize_t n;
+	struct ether_header *eh;
 
 #ifdef ETHER_DEBUG
  	if (debug)
@@ -95,14 +95,14 @@ sendether(d, pkt, len, dea, etype)
  */
 ssize_t
 readether(d, pkt, len, tleft, etype)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
-	register u_int16_t *etype;
+	u_int16_t *etype;
 {
-	register ssize_t n;
-	register struct ether_header *eh;
+	ssize_t n;
+	struct ether_header *eh;
 
 #ifdef ETHER_DEBUG
  	if (debug)
@@ -138,11 +138,11 @@ readether(d, pkt, len, tleft, etype)
 static char digits[] = "0123456789abcdef";
 char *
 ether_sprintf(ap)
-        register u_char *ap;
+        u_char *ap;
 {
-	register int i;
+	int i;
 	static char etherbuf[18];
-	register char *cp = etherbuf;
+	char *cp = etherbuf;
 
 	for (i = 0; i < 6; i++) {
 		*cp++ = digits[*ap >> 4];
diff --git a/lib/libstand/fstat.c b/lib/libstand/fstat.c
index 8504acfb8bb0..3a5f39f93fae 100644
--- a/lib/libstand/fstat.c
+++ b/lib/libstand/fstat.c
@@ -45,7 +45,7 @@ fstat(fd, sb)
 	int fd;
 	struct stat *sb;
 {
-	register struct open_file *f = &files[fd];
+	struct open_file *f = &files[fd];
 
 	if ((unsigned)fd >= SOPEN_MAX || f->f_flags == 0) {
 		errno = EBADF;
diff --git a/lib/libstand/gets.c b/lib/libstand/gets.c
index dec627dd192f..cb0e7557c160 100644
--- a/lib/libstand/gets.c
+++ b/lib/libstand/gets.c
@@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$");
 void
 ngets(char *buf, int n)
 {
-    register int c;
-    register char *lp;
+    int c;
+    char *lp;
 
     for (lp = buf;;)
 	switch (c = getchar() & 0177) {
@@ -65,7 +65,7 @@ ngets(char *buf, int n)
 	    }
 	    break;
 	case 'r'&037: {
-	    register char *p;
+	    char *p;
 
 	    putchar('\n');
 	    for (p = buf; p < lp; ++p)
diff --git a/lib/libstand/in_cksum.c b/lib/libstand/in_cksum.c
index 11bc75c45cf9..1fc734454192 100644
--- a/lib/libstand/in_cksum.c
+++ b/lib/libstand/in_cksum.c
@@ -52,11 +52,11 @@ __FBSDID("$FreeBSD$");
  */
 int
 in_cksum(p, len)
-	register void *p;
-	register int len;
+	void *p;
+	int len;
 {
-	register int sum = 0, oddbyte = 0, v = 0;
-	register u_char *cp = p;
+	int sum = 0, oddbyte = 0, v = 0;
+	u_char *cp = p;
 
 	/* we assume < 2^16 bytes being summed */
 	while (len > 0) {
diff --git a/lib/libstand/ioctl.c b/lib/libstand/ioctl.c
index 45a014c39d4e..debd9e4ef8b3 100644
--- a/lib/libstand/ioctl.c
+++ b/lib/libstand/ioctl.c
@@ -75,7 +75,7 @@ ioctl(fd, cmd, arg)
 	u_long cmd;
 	char *arg;
 {
-	register struct open_file *f = &files[fd];
+	struct open_file *f = &files[fd];
 
 	if ((unsigned)fd >= SOPEN_MAX || f->f_flags == 0) {
 		errno = EBADF;
diff --git a/lib/libstand/net.c b/lib/libstand/net.c
index 06d9dbf56baa..89ef12d30aa8 100644
--- a/lib/libstand/net.c
+++ b/lib/libstand/net.c
@@ -73,16 +73,16 @@ __FBSDID("$FreeBSD$");
  */
 ssize_t
 sendrecv(d, sproc, sbuf, ssize, rproc, rbuf, rsize)
-	register struct iodesc *d;
-	register ssize_t (*sproc)(struct iodesc *, void *, size_t);
-	register void *sbuf;
-	register size_t ssize;
-	register ssize_t (*rproc)(struct iodesc *, void *, size_t, time_t);
-	register void *rbuf;
-	register size_t rsize;
+	struct iodesc *d;
+	ssize_t (*sproc)(struct iodesc *, void *, size_t);
+	void *sbuf;
+	size_t ssize;
+	ssize_t (*rproc)(struct iodesc *, void *, size_t, time_t);
+	void *rbuf;
+	size_t rsize;
 {
-	register ssize_t cc;
-	register time_t t, tmo, tlast;
+	ssize_t cc;
+	time_t t, tmo, tlast;
 	long tleft;
 
 #ifdef NET_DEBUG
@@ -140,11 +140,11 @@ n_long
 inet_addr(cp)
 	char *cp;
 {
-	register u_long val;
-	register int n;
-	register char c;
+	u_long val;
+	int n;
+	char c;
 	u_int parts[4];
-	register u_int *pp = parts;
+	u_int *pp = parts;
 
 	for (;;) {
 		/*
@@ -224,11 +224,11 @@ inet_ntoa(ia)
 /* Similar to inet_ntoa() */
 char *
 intoa(addr)
-	register n_long addr;
+	n_long addr;
 {
-	register char *cp;
-	register u_int byte;
-	register int n;
+	char *cp;
+	u_int byte;
+	int n;
 	static char buf[17];	/* strlen(".255.255.255.255") + 1 */
 
 	addr = ntohl(addr);
diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index baae9a91f8f8..c260690c503c 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -293,7 +293,7 @@ netif_open(machdep_hint)
 	void *machdep_hint;
 {
 	int fd;
-	register struct iodesc *s;
+	struct iodesc *s;
 	struct netif *nif;
 	
 	/* find a free socket */
diff --git a/lib/libstand/nfs.c b/lib/libstand/nfs.c
index 1fc62b7bb70b..1b9e8d2eca34 100644
--- a/lib/libstand/nfs.c
+++ b/lib/libstand/nfs.c
@@ -148,11 +148,11 @@ struct fs_ops nfs_fsops = {
  */
 int
 nfs_getrootfh(d, path, fhp)
-	register struct iodesc *d;
+	struct iodesc *d;
 	char *path;
 	u_char *fhp;
 {
-	register int len;
+	int len;
 	struct args {
 		n_long	len;
 		char	path[FNAME_SIZE];
@@ -211,7 +211,7 @@ nfs_lookupfh(d, name, newfd)
 	const char *name;
 	struct nfs_iodesc *newfd;
 {
-	register int len, rlen;
+	int len, rlen;
 	struct args {
 		u_char	fh[NFS_FHSIZE];
 		n_long	len;
@@ -390,8 +390,8 @@ nfs_open(upath, f)
 #ifndef NFS_NOSYMLINK
 	struct nfs_iodesc *newfd;
 	struct nfsv2_fattrs *fa;
-	register char *cp, *ncp;
-	register int c;
+	char *cp, *ncp;
+	int c;
 	char namebuf[NFS_MAXPATHLEN + 1];
 	char linkbuf[NFS_MAXPATHLEN + 1];
 	int nlinks = 0;
@@ -459,7 +459,7 @@ nfs_open(upath, f)
 		 * Get next component of path name.
 		 */
 		{
-			register int len = 0;
+			int len = 0;
 			
 			ncp = cp;
 			while ((c = *cp) != '\0' && c != '/') {
@@ -560,7 +560,7 @@ int
 nfs_close(f)
 	struct open_file *f;
 {
-	register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
+	struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
 
 #ifdef NFS_DEBUG
 	if (debug)
@@ -584,9 +584,9 @@ nfs_read(f, buf, size, resid)
 	size_t size;
 	size_t *resid;	/* out */
 {
-	register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
-	register ssize_t cc;
-	register char *addr = buf;
+	struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
+	ssize_t cc;
+	char *addr = buf;
 	
 #ifdef NFS_DEBUG
 	if (debug)
@@ -641,7 +641,7 @@ nfs_seek(f, offset, where)
 	off_t offset;
 	int where;
 {
-	register struct nfs_iodesc *d = (struct nfs_iodesc *)f->f_fsdata;
+	struct nfs_iodesc *d = (struct nfs_iodesc *)f->f_fsdata;
 	n_long size = ntohl(d->fa.fa_size);
 
 	switch (where) {
@@ -671,7 +671,7 @@ nfs_stat(f, sb)
 	struct stat *sb;
 {
 	struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
-	register n_long ftype, mode;
+	n_long ftype, mode;
 
 	ftype = ntohl(fp->fa.fa_type);
 	mode  = ntohl(fp->fa.fa_mode);
@@ -689,7 +689,7 @@ nfs_stat(f, sb)
 static int
 nfs_readdir(struct open_file *f, struct dirent *d)
 {
-	register struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
+	struct nfs_iodesc *fp = (struct nfs_iodesc *)f->f_fsdata;
 	struct nfs_readdir_args *args;
 	struct nfs_readdir_data *rd;
 	struct nfs_readdir_off  *roff = NULL;
diff --git a/lib/libstand/printf.c b/lib/libstand/printf.c
index a9ed2258e11c..6afcbfd37916 100644
--- a/lib/libstand/printf.c
+++ b/lib/libstand/printf.c
@@ -106,11 +106,11 @@ vsprintf(char *buf, const char *cfmt, va_list ap)
  */
 static char *
 ksprintn(ul, base, lenp)
-	register u_long ul;
-	register int base, *lenp;
+	u_long ul;
+	int base, *lenp;
 {					/* A long in base 8, plus NULL. */
 	static char buf[sizeof(long) * NBBY / 3 + 2];
-	register char *p;
+	char *p;
 
 	p = buf;
 	do {
diff --git a/lib/libstand/qdivrem.c b/lib/libstand/qdivrem.c
index d064c426a877..c6fd4ebc11d4 100644
--- a/lib/libstand/qdivrem.c
+++ b/lib/libstand/qdivrem.c
@@ -65,9 +65,9 @@ typedef u_long digit;
  * We may assume len >= 0.  NOTE THAT THIS WRITES len+1 DIGITS.
  */
 static void
-shl(register digit *p, register int len, register int sh)
+shl(digit *p, int len, int sh)
 {
-	register int i;
+	int i;
 
 	for (i = 0; i < len; i++)
 		p[i] = LHALF(p[i] << sh) | (p[i + 1] >> (HALF_BITS - sh));
@@ -88,7 +88,7 @@ __qdivrem(uq, vq, arq)
 {
 	union uu tmp;
 	digit *u, *v, *q;
-	register digit v1, v2;
+	digit v1, v2;
 	u_long qhat, rhat, t;
 	int m, n, d, j, i;
 	digit uspace[5], vspace[5], qspace[5];
@@ -198,7 +198,7 @@ __qdivrem(uq, vq, arq)
 	v1 = v[1];	/* for D3 -- note that v[1..n] are constant */
 	v2 = v[2];	/* for D3 */
 	do {
-		register digit uj0, uj1, uj2;
+		digit uj0, uj1, uj2;
 
 		/*
 		 * D3: Calculate qhat (\^q, in TeX notation).
diff --git a/lib/libstand/random.c b/lib/libstand/random.c
index 994d3076e3aa..441c4ae6d6ac 100644
--- a/lib/libstand/random.c
+++ b/lib/libstand/random.c
@@ -55,7 +55,7 @@ srandom(seed)
 u_long
 random()
 {
-	register long x, hi, lo, t;
+	long x, hi, lo, t;
 
 	/*
 	 * Compute x[n + 1] = (7^5 * x[n]) mod (2^31 - 1).
diff --git a/lib/libstand/rarp.c b/lib/libstand/rarp.c
index b9b317fec2a7..eed1ed0594d6 100644
--- a/lib/libstand/rarp.c
+++ b/lib/libstand/rarp.c
@@ -68,7 +68,7 @@ rarp_getipaddress(sock)
 	int sock;
 {
 	struct iodesc *d;
-	register struct ether_arp *ap;
+	struct ether_arp *ap;
 	struct {
 		u_char header[ETHER_SIZE];
 		struct {
@@ -139,9 +139,9 @@ rarp_getipaddress(sock)
  */
 static ssize_t
 rarpsend(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 {
 
 #ifdef RARP_DEBUG
@@ -158,13 +158,13 @@ rarpsend(d, pkt, len)
  */
 static ssize_t
 rarprecv(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
 {
-	register ssize_t n;
-	register struct ether_arp *ap;
+	ssize_t n;
+	struct ether_arp *ap;
 	u_int16_t etype;	/* host order */
 
 #ifdef RARP_DEBUG
diff --git a/lib/libstand/rpc.c b/lib/libstand/rpc.c
index 17f4362fc530..bddb49d51781 100644
--- a/lib/libstand/rpc.c
+++ b/lib/libstand/rpc.c
@@ -113,14 +113,14 @@ int rpc_port = 0x400;	/* predecrement */
  */
 ssize_t
 rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
-	register struct iodesc *d;
-	register n_long prog, vers, proc;
-	register void *sdata;
-	register size_t slen;
-	register void *rdata;
-	register size_t rlen;
+	struct iodesc *d;
+	n_long prog, vers, proc;
+	void *sdata;
+	size_t slen;
+	void *rdata;
+	size_t rlen;
 {
-	register ssize_t cc;
+	ssize_t cc;
 	struct auth_info *auth;
 	struct rpc_call *call;
 	struct rpc_reply *reply;
@@ -237,12 +237,12 @@ rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
  */
 static ssize_t
 recvrpc(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
 {
-	register struct rpc_reply *reply;
+	struct rpc_reply *reply;
 	ssize_t	n;
 	int	x;
 
@@ -382,7 +382,7 @@ rpc_pmap_putcache(addr, prog, vers, port)
  */
 int
 rpc_getport(d, prog, vers)
-	register struct iodesc *d;
+	struct iodesc *d;
 	n_long prog;	/* host order */
 	n_long vers;	/* host order */
 {
diff --git a/lib/libstand/strcasecmp.c b/lib/libstand/strcasecmp.c
index 05b6c369004c..9eb8350938c3 100644
--- a/lib/libstand/strcasecmp.c
+++ b/lib/libstand/strcasecmp.c
@@ -46,7 +46,7 @@ int
 strcasecmp(s1, s2)
 	const char *s1, *s2;
 {
-	register const u_char
+	const u_char
 			*us1 = (const u_char *)s1,
 			*us2 = (const u_char *)s2;
 
@@ -59,10 +59,10 @@ strcasecmp(s1, s2)
 int
 strncasecmp(s1, s2, n)
 	const char *s1, *s2;
-	register size_t n;
+	size_t n;
 {
 	if (n != 0) {
-		register const u_char
+		const u_char
 				*us1 = (const u_char *)s1,
 				*us2 = (const u_char *)s2;
 
diff --git a/lib/libstand/strtol.c b/lib/libstand/strtol.c
index 30c5cbbf1026..4844a1a0972f 100644
--- a/lib/libstand/strtol.c
+++ b/lib/libstand/strtol.c
@@ -51,13 +51,13 @@ long
 strtol(nptr, endptr, base)
 	const char *nptr;
 	char **endptr;
-	register int base;
+	int base;
 {
-	register const char *s;
-	register unsigned long acc;
-	register unsigned char c;
-	register unsigned long cutoff;
-	register int neg = 0, any, cutlim;
+	const char *s;
+	unsigned long acc;
+	unsigned char c;
+	unsigned long cutoff;
+	int neg = 0, any, cutlim;
 
 	/* Be sensible about NULL strings */
 	if (nptr == NULL)
diff --git a/lib/libstand/tftp.c b/lib/libstand/tftp.c
index e0190105dbbf..739015d38aef 100644
--- a/lib/libstand/tftp.c
+++ b/lib/libstand/tftp.c
@@ -111,9 +111,9 @@ static int tftperrors[8] = {
 
 static ssize_t 
 recvtftp(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void  *pkt;
-	register ssize_t len;
+	struct iodesc *d;
+	void  *pkt;
+	ssize_t len;
 	time_t          tleft;
 {
 	struct tftphdr *t;
@@ -140,7 +140,7 @@ recvtftp(d, pkt, len, tleft)
 			/*
 			 * First data packet from new port.
 			 */
-			register struct udphdr *uh;
+			struct udphdr *uh;
 			uh = (struct udphdr *) pkt - 1;
 			d->destport = uh->uh_sport;
 		} /* else check uh_sport has not changed??? */
diff --git a/lib/libstand/udp.c b/lib/libstand/udp.c
index 4dbd7957bd87..49539329b6ca 100644
--- a/lib/libstand/udp.c
+++ b/lib/libstand/udp.c
@@ -63,14 +63,14 @@ __FBSDID("$FreeBSD$");
 /* Caller must leave room for ethernet, ip and udp headers in front!! */
 ssize_t
 sendudp(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 {
-	register ssize_t cc;
-	register struct ip *ip;
-	register struct udphdr *uh;
-	register u_char *ea;
+	ssize_t cc;
+	struct ip *ip;
+	struct udphdr *uh;
+	u_char *ea;
 
 #ifdef NET_DEBUG
  	if (debug) {
@@ -105,7 +105,7 @@ sendudp(d, pkt, len)
 
 #ifndef UDP_NO_CKSUM
 	{
-		register struct udpiphdr *ui;
+		struct udpiphdr *ui;
 		struct ip tip;
 
 		/* Calculate checksum (must save and restore ip header) */
@@ -138,15 +138,15 @@ sendudp(d, pkt, len)
  */
 ssize_t
 readudp(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
+	struct iodesc *d;
+	void *pkt;
+	size_t len;
 	time_t tleft;
 {
-	register ssize_t n;
-	register size_t hlen;
-	register struct ip *ip;
-	register struct udphdr *uh;
+	ssize_t n;
+	size_t hlen;
+	struct ip *ip;
+	struct udphdr *uh;
 	u_int16_t etype;	/* host order */
 
 #ifdef NET_DEBUG
@@ -235,7 +235,7 @@ readudp(d, pkt, len, tleft)
 
 #ifndef UDP_NO_CKSUM
 	if (uh->uh_sum) {
-		register struct udpiphdr *ui;
+		struct udpiphdr *ui;
 		struct ip tip;
 
 		n = ntohs(uh->uh_ulen) + sizeof(*ip);
diff --git a/lib/libstand/ufs.c b/lib/libstand/ufs.c
index 35af957dbc6e..099db2297dec 100644
--- a/lib/libstand/ufs.c
+++ b/lib/libstand/ufs.c
@@ -137,8 +137,8 @@ read_inode(inumber, f)
 	ino_t inumber;
 	struct open_file *f;
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct fs *fs = fp->f_fs;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct fs *fs = fp->f_fs;
 	char *buf;
 	size_t rsize;
 	int rc;
@@ -162,7 +162,7 @@ read_inode(inumber, f)
 	}
 
 	{
-		register struct dinode *dp;
+		struct dinode *dp;
 
 		dp = (struct dinode *)buf;
 		fp->f_di = dp[ino_to_fsbo(fs, inumber)];
@@ -172,7 +172,7 @@ read_inode(inumber, f)
 	 * Clear out the old buffers
 	 */
 	{
-		register int level;
+		int level;
 
 		for (level = 0; level < NIADDR; level++)
 			fp->f_blkno[level] = -1;
@@ -193,8 +193,8 @@ block_map(f, file_block, disk_block_p)
 	daddr_t file_block;
 	daddr_t *disk_block_p;	/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct fs *fs = fp->f_fs;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct fs *fs = fp->f_fs;
 	int level;
 	int idx;
 	daddr_t ind_block_num;
@@ -298,10 +298,10 @@ buf_write_file(f, buf_p, size_p)
 	char *buf_p;
 	size_t *size_p;		/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct fs *fs = fp->f_fs;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct fs *fs = fp->f_fs;
 	long off;
-	register daddr_t file_block;
+	daddr_t file_block;
 	daddr_t	disk_block;
 	size_t block_size;
 	int rc;
@@ -375,10 +375,10 @@ buf_read_file(f, buf_p, size_p)
 	char **buf_p;		/* out */
 	size_t *size_p;		/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct fs *fs = fp->f_fs;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct fs *fs = fp->f_fs;
 	long off;
-	register daddr_t file_block;
+	daddr_t file_block;
 	daddr_t	disk_block;
 	size_t block_size;
 	int rc;
@@ -437,8 +437,8 @@ search_directory(name, f, inumber_p)
 	struct open_file *f;
 	ino_t *inumber_p;		/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register struct direct *dp;
+	struct file *fp = (struct file *)f->f_fsdata;
+	struct direct *dp;
 	struct direct *edp;
 	char *buf;
 	size_t buf_size;
@@ -486,8 +486,8 @@ ufs_open(upath, f)
 	const char *upath;
 	struct open_file *f;
 {
-	register char *cp, *ncp;
-	register int c;
+	char *cp, *ncp;
+	int c;
 	ino_t inumber, parent_inumber;
 	struct file *fp;
 	struct fs *fs;
@@ -525,8 +525,8 @@ ufs_open(upath, f)
 	 * Calculate indirect block levels.
 	 */
 	{
-		register int mult;
-		register int level;
+		int mult;
+		int level;
 
 		mult = 1;
 		for (level = 0; level < NIADDR; level++) {
@@ -566,7 +566,7 @@ ufs_open(upath, f)
 		 * Get next component of path name.
 		 */
 		{
-			register int len = 0;
+			int len = 0;
 
 			ncp = cp;
 			while ((c = *cp) != '\0' && c != '/') {
@@ -622,7 +622,7 @@ ufs_open(upath, f)
 				 */
 				size_t buf_size;
 				daddr_t	disk_block;
-				register struct fs *fs = fp->f_fs;
+				struct fs *fs = fp->f_fs;
 
 				if (!buf)
 					buf = malloc(fs->fs_bsize);
@@ -677,7 +677,7 @@ static int
 ufs_close(f)
 	struct open_file *f;
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
+	struct file *fp = (struct file *)f->f_fsdata;
 	int level;
 
 	f->f_fsdata = (void *)0;
@@ -706,12 +706,12 @@ ufs_read(f, start, size, resid)
 	size_t size;
 	size_t *resid;	/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
-	register size_t csize;
+	struct file *fp = (struct file *)f->f_fsdata;
+	size_t csize;
 	char *buf;
 	size_t buf_size;
 	int rc = 0;
-	register char *addr = start;
+	char *addr = start;
 
 	while (size != 0) {
 		if (fp->f_seekp >= fp->f_di.di_size)
@@ -748,10 +748,10 @@ ufs_write(f, start, size, resid)
 	size_t size;
 	size_t *resid;	/* out */
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
+	struct file *fp = (struct file *)f->f_fsdata;
 	size_t csize;
 	int rc = 0;
-	register char *addr = start;
+	char *addr = start;
 
 	csize = size;
 	while ((size != 0) && (csize != 0)) {
@@ -779,7 +779,7 @@ ufs_seek(f, offset, where)
 	off_t offset;
 	int where;
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
+	struct file *fp = (struct file *)f->f_fsdata;
 
 	switch (where) {
 	case SEEK_SET:
@@ -802,7 +802,7 @@ ufs_stat(f, sb)
 	struct open_file *f;
 	struct stat *sb;
 {
-	register struct file *fp = (struct file *)f->f_fsdata;
+	struct file *fp = (struct file *)f->f_fsdata;
 
 	/* only important stuff */
 	sb->st_mode = fp->f_di.di_mode;
diff --git a/lib/libstand/write.c b/lib/libstand/write.c
index ea9d491afa9c..8f0fa9712ad4 100644
--- a/lib/libstand/write.c
+++ b/lib/libstand/write.c
@@ -76,7 +76,7 @@ write(fd, dest, bcount)
 	void *dest;
 	size_t bcount;
 {
-	register struct open_file *f = &files[fd];
+	struct open_file *f = &files[fd];
 	size_t resid;
 
 	if ((unsigned)fd >= SOPEN_MAX || !(f->f_flags & F_WRITE)) {