Remove 'register' keyword.

It does not help modern compilers, and some may take some hit from it.
(I also found several functions that listed *every* of its 10 local vars with
 "register" -- just how many free registers do people think machines have?)

6 files changed, 77 insertions, 77 deletions

diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index e822f5d..46cd7f3 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -141,8 +141,8 @@ void
 extractdirs(genmode)
 	int genmode;
 {
-	register int i;
-	register struct dinode *ip;
+	int i;
+	struct dinode *ip;
 	struct inotab *itp;
 	struct direct nulldir;
 	int fd;
@@ -229,8 +229,8 @@ treescan(pname, ino, todo)
 	ino_t ino;
 	long (*todo) __P((char *, ino_t, int));
 {
-	register struct inotab *itp;
-	register struct direct *dp;
+	struct inotab *itp;
+	struct direct *dp;
 	int namelen;
 	long bpt;
 	char locname[MAXPATHLEN + 1];
@@ -321,8 +321,8 @@ searchdir(inum, name)
 	ino_t	inum;
 	char	*name;
 {
-	register struct direct *dp;
-	register struct inotab *itp;
+	struct direct *dp;
+	struct inotab *itp;
 	int len;
 
 	itp = inotablookup(inum);
@@ -347,9 +347,9 @@ putdir(buf, size)
 	long size;
 {
 	struct direct cvtbuf;
-	register struct odirect *odp;
+	struct odirect *odp;
 	struct odirect *eodp;
-	register struct direct *dp;
+	struct direct *dp;
 	long loc, i;
 
 	if (cvtflag) {
@@ -443,8 +443,8 @@ flushent()
 
 static void
 dcvt(odp, ndp)
-	register struct odirect *odp;
-	register struct direct *ndp;
+	struct odirect *odp;
+	struct direct *ndp;
 {
 
 	memset(ndp, 0, (long)(sizeof *ndp));
@@ -464,7 +464,7 @@ dcvt(odp, ndp)
  */
 static void
 rst_seekdir(dirp, loc, base)
-	register RST_DIR *dirp;
+	RST_DIR *dirp;
 	long loc, base;
 {
 
@@ -484,9 +484,9 @@ rst_seekdir(dirp, loc, base)
  */
 struct direct *
 rst_readdir(dirp)
-	register RST_DIR *dirp;
+	RST_DIR *dirp;
 {
-	register struct direct *dp;
+	struct direct *dp;
 
 	for (;;) {
 		if (dirp->dd_loc == 0) {
@@ -571,8 +571,8 @@ static RST_DIR *
 opendirfile(name)
 	const char *name;
 {
-	register RST_DIR *dirp;
-	register int fd;
+	RST_DIR *dirp;
+	int fd;
 
 	if ((fd = open(name, O_RDONLY)) == -1)
 		return (NULL);
@@ -658,7 +658,7 @@ genliteraldir(name, ino)
 	char *name;
 	ino_t ino;
 {
-	register struct inotab *itp;
+	struct inotab *itp;
 	int ofile, dp, i, size;
 	char buf[BUFSIZ];
 
@@ -720,7 +720,7 @@ allocinotab(ino, dip, seekpt)
 	struct dinode *dip;
 	long seekpt;
 {
-	register struct inotab	*itp;
+	struct inotab	*itp;
 	struct modeinfo node;
 
 	itp = calloc(1, sizeof(struct inotab));
@@ -752,7 +752,7 @@ static struct inotab *
 inotablookup(ino)
 	ino_t	ino;
 {
-	register struct inotab *itp;
+	struct inotab *itp;
 
 	for (itp = inotab[INOHASH(ino)]; itp != NULL; itp = itp->t_next)
 		if (itp->t_ino == ino)
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 1fd8930..e04f48e 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -96,7 +96,7 @@ static void	 printlist __P((char *, char *));
 void
 runcmdshell()
 {
-	register struct entry *np;
+	struct entry *np;
 	ino_t ino;
 	struct arglist arglist;
 	char curdir[MAXPATHLEN];
@@ -307,7 +307,7 @@ getcmd(curdir, cmd, name, size, ap)
 	struct arglist *ap;
 	int size;
 {
-	register char *cp;
+	char *cp;
 	static char input[BUFSIZ];
 	char output[BUFSIZ];
 #	define rawname input	/* save space by reusing input buffer */
@@ -393,7 +393,7 @@ static char *
 copynext(input, output)
 	char *input, *output;
 {
-	register char *cp, *bp;
+	char *cp, *bp;
 	char quote;
 
 	for (cp = input; *cp == ' ' || *cp == '\t'; cp++)
@@ -444,7 +444,7 @@ canon(rawname, canonname, len)
 	char *rawname, *canonname;
 	int len;
 {
-	register char *cp, *np;
+	char *cp, *np;
 
 	if (strcmp(rawname, ".") == 0 || strncmp(rawname, "./", 2) == 0)
 		(void) strcpy(canonname, "");
@@ -500,8 +500,8 @@ printlist(name, basename)
 	char *name;
 	char *basename;
 {
-	register struct afile *fp, *list, *listp;
-	register struct direct *dp;
+	struct afile *fp, *list, *listp;
+	struct direct *dp;
 	struct afile single;
 	RST_DIR *dirp;
 	int entries, len, namelen;
@@ -583,7 +583,7 @@ static void
 mkentry(name, dp, fp)
 	char *name;
 	struct direct *dp;
-	register struct afile *fp;
+	struct afile *fp;
 {
 	char *cp;
 	struct entry *np;
@@ -644,10 +644,10 @@ mkentry(name, dp, fp)
  */
 static void
 formatf(list, nentry)
-	register struct afile *list;
+	struct afile *list;
 	int nentry;
 {
-	register struct afile *fp, *endlist;
+	struct afile *fp, *endlist;
 	int width, bigino, haveprefix, havepostfix;
 	int i, j, w, precision, columns, lines;
 
@@ -744,7 +744,7 @@ glob_stat(name, stp)
 	const char *name;
 	struct stat *stp;
 {
-	register struct direct *dp;
+	struct direct *dp;
 
 	dp = pathsearch(name);
 	if (dp == NULL || (!dflag && TSTINO(dp->d_ino, dumpmap) == 0) ||
@@ -762,7 +762,7 @@ glob_stat(name, stp)
  */
 static int
 fcmp(f1, f2)
-	register const void *f1, *f2;
+	const void *f1, *f2;
 {
 	return (strcmp(((struct afile *)f1)->fname,
 	    ((struct afile *)f2)->fname));
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 901439c..61cd432 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -80,7 +80,7 @@ addfile(name, ino, type)
 	ino_t ino;
 	int type;
 {
-	register struct entry *ep;
+	struct entry *ep;
 	long descend = hflag ? GOOD : FAIL;
 	char buf[100];
 
@@ -162,8 +162,8 @@ static struct entry *removelist;
 void
 removeoldleaves()
 {
-	register struct entry *ep, *nextep;
-	register ino_t i, mydirino;
+	struct entry *ep, *nextep;
+	ino_t i, mydirino;
 
 	vprintf(stdout, "Mark entries to be removed.\n");
 	if ((ep = lookupino(WINO))) {
@@ -218,7 +218,7 @@ nodeupdates(name, ino, type)
 	ino_t ino;
 	int type;
 {
-	register struct entry *ep, *np, *ip;
+	struct entry *ep, *np, *ip;
 	long descend = GOOD;
 	int lookuptype = 0;
 	int key = 0;
@@ -526,8 +526,8 @@ keyval(key)
 void
 findunreflinks()
 {
-	register struct entry *ep, *np;
-	register ino_t i;
+	struct entry *ep, *np;
+	ino_t i;
 
 	vprintf(stdout, "Find unreferenced names.\n");
 	for (i = ROOTINO; i < maxino; i++) {
@@ -574,7 +574,7 @@ findunreflinks()
 void
 removeoldnodes()
 {
-	register struct entry *ep, **prev;
+	struct entry *ep, **prev;
 	long change;
 
 	vprintf(stdout, "Remove old nodes (directories).\n");
@@ -604,7 +604,7 @@ void
 createleaves(symtabfile)
 	char *symtabfile;
 {
-	register struct entry *ep;
+	struct entry *ep;
 	ino_t first;
 	long curvol;
 
@@ -683,8 +683,8 @@ createleaves(symtabfile)
 void
 createfiles()
 {
-	register ino_t first, next, last;
-	register struct entry *ep;
+	ino_t first, next, last;
+	struct entry *ep;
 	long curvol;
 
 	vprintf(stdout, "Extract requested files\n");
@@ -779,8 +779,8 @@ createfiles()
 void
 createlinks()
 {
-	register struct entry *np, *ep;
-	register ino_t i;
+	struct entry *np, *ep;
+	ino_t i;
 	char name[BUFSIZ];
 
 	if ((ep = lookupino(WINO))) {
@@ -819,8 +819,8 @@ createlinks()
 void
 checkrestore()
 {
-	register struct entry *ep;
-	register ino_t i;
+	struct entry *ep;
+	ino_t i;
 
 	vprintf(stdout, "Check the symbol table.\n");
 	for (i = WINO; i < maxino; i++) {
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 6ad8785..ee7b1f7 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -85,7 +85,7 @@ struct entry *
 lookupino(inum)
 	ino_t inum;
 {
-	register struct entry *ep;
+	struct entry *ep;
 
 	if (inum < WINO || inum >= maxino)
 		return (NULL);
@@ -124,7 +124,7 @@ void
 deleteino(inum)
 	ino_t inum;
 {
-	register struct entry *next;
+	struct entry *next;
 	struct entry **prev;
 
 	if (inum < WINO || inum >= maxino)
@@ -148,8 +148,8 @@ struct entry *
 lookupname(name)
 	char *name;
 {
-	register struct entry *ep;
-	register char *np, *cp;
+	struct entry *ep;
+	char *np, *cp;
 	char buf[MAXPATHLEN];
 
 	cp = name;
@@ -199,9 +199,9 @@ lookupparent(name)
  */
 char *
 myname(ep)
-	register struct entry *ep;
+	struct entry *ep;
 {
-	register char *cp;
+	char *cp;
 	static char namebuf[MAXPATHLEN];
 
 	for (cp = &namebuf[MAXPATHLEN - 2]; cp > &namebuf[ep->e_namlen]; ) {
@@ -231,7 +231,7 @@ addentry(name, inum, type)
 	ino_t inum;
 	int type;
 {
-	register struct entry *np, *ep;
+	struct entry *np, *ep;
 
 	if (freelist != NULL) {
 		np = freelist;
@@ -278,9 +278,9 @@ addentry(name, inum, type)
  */
 void
 freeentry(ep)
-	register struct entry *ep;
+	struct entry *ep;
 {
-	register struct entry *np;
+	struct entry *np;
 	ino_t inum;
 
 	if (ep->e_flags != REMOVED)
@@ -322,7 +322,7 @@ freeentry(ep)
  */
 void
 moveentry(ep, newname)
-	register struct entry *ep;
+	struct entry *ep;
 	char *newname;
 {
 	struct entry *np;
@@ -352,9 +352,9 @@ moveentry(ep, newname)
  */
 static void
 removeentry(ep)
-	register struct entry *ep;
+	struct entry *ep;
 {
-	register struct entry *np;
+	struct entry *np;
 
 	np = ep->e_parent;
 	if (np->e_entries == ep) {
@@ -457,8 +457,8 @@ dumpsymtable(filename, checkpt)
 	char *filename;
 	long checkpt;
 {
-	register struct entry *ep, *tep;
-	register ino_t i;
+	struct entry *ep, *tep;
+	ino_t i;
 	struct entry temp, *tentry;
 	long mynum = 1, stroff = 0;
 	FILE *fd;
@@ -546,11 +546,11 @@ initsymtable(filename)
 {
 	char *base;
 	long tblsize;
-	register struct entry *ep;
+	struct entry *ep;
 	struct entry *baseep, *lep;
 	struct symtableheader hdr;
 	struct stat stbuf;
-	register long i;
+	long i;
 	int fd;
 
 	vprintf(stdout, "Initialize symbol table.\n");
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 4bfa5fa..982a4e1 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -681,7 +681,7 @@ getfile(fill, skip)
 	void	(*fill) __P((char *, long));
 	void	(*skip) __P((char *, long));
 {
-	register int i;
+	int i;
 	int curblk = 0;
 	quad_t size = spcl.c_dinode.di_size;
 	static char clearedbuf[MAXBSIZE];
@@ -969,7 +969,7 @@ getmore:
 static void
 findtapeblksize()
 {
-	register long i;
+	long i;
 
 	for (i = 0; i < ntrec; i++)
 		((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
@@ -1297,9 +1297,9 @@ findinode(header)
 
 static int
 checksum(buf)
-	register int *buf;
+	int *buf;
 {
-	register int i, j;
+	int i, j;
 
 	j = sizeof(union u_spcl) / sizeof(int);
 	i = 0;
@@ -1352,8 +1352,8 @@ msg(fmt, va_alist)
 
 static u_char *
 swabshort(sp, n)
-	register u_char *sp;
-	register int n;
+	u_char *sp;
+	int n;
 {
 	char c;
 
@@ -1366,8 +1366,8 @@ swabshort(sp, n)
 
 static u_char *
 swablong(sp, n)
-	register u_char *sp;
-	register int n;
+	u_char *sp;
+	int n;
 {
 	char c;
 
@@ -1381,7 +1381,7 @@ swablong(sp, n)
 
 void
 swabst(cp, sp)
-	register u_char *cp, *sp;
+	u_char *cp, *sp;
 {
 	int n = 0;
 
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index 1e6ccfc..837213d 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -61,7 +61,7 @@ void
 pathcheck(name)
 	char *name;
 {
-	register char *cp;
+	char *cp;
 	struct entry *ep;
 	char *start;
 
@@ -88,7 +88,7 @@ pathcheck(name)
  */
 void
 mktempname(ep)
-	register struct entry *ep;
+	struct entry *ep;
 {
 	char oldname[MAXPATHLEN];
 
@@ -162,7 +162,7 @@ newnode(np)
  */
 void
 removenode(ep)
-	register struct entry *ep;
+	struct entry *ep;
 {
 	char *cp;
 
@@ -185,7 +185,7 @@ removenode(ep)
  */
 void
 removeleaf(ep)
-	register struct entry *ep;
+	struct entry *ep;
 {
 	char *cp;
 
@@ -274,7 +274,7 @@ addwhiteout(name)
  */
 void
 delwhiteout(ep)
-	register struct entry *ep;
+	struct entry *ep;
 {
 	char *name;
 
@@ -298,7 +298,7 @@ ino_t
 lowerbnd(start)
 	ino_t start;
 {
-	register struct entry *ep;
+	struct entry *ep;
 
 	for ( ; start < maxino; start++) {
 		ep = lookupino(start);
@@ -317,7 +317,7 @@ ino_t
 upperbnd(start)
 	ino_t start;
 {
-	register struct entry *ep;
+	struct entry *ep;
 
 	for ( ; start > ROOTINO; start--) {
 		ep = lookupino(start);
@@ -334,7 +334,7 @@ upperbnd(start)
  */
 void
 badentry(ep, msg)
-	register struct entry *ep;
+	struct entry *ep;
 	char *msg;
 {
 
@@ -361,7 +361,7 @@ badentry(ep, msg)
  */
 char *
 flagvalues(ep)
-	register struct entry *ep;
+	struct entry *ep;
 {
 	static char flagbuf[BUFSIZ];