From feb655258203ffff04e41577c5ebe51c8112036b Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sun, 6 Nov 2005 12:13:53 +0000
Subject: [PATCH] Cleanup:

- Remove 'register' storage class specifiers.
- Ansify function definitions.
---
 sbin/fsck/dir.c       | 42 +++++++++++++++++++++---------------------
 sbin/fsck/inode.c     | 32 ++++++++++++++++----------------
 sbin/fsck/main.c      |  4 ++--
 sbin/fsck/pass1.c     | 12 +++++-------
 sbin/fsck/pass1b.c    | 10 +++++-----
 sbin/fsck/pass2.c     | 10 +++++-----
 sbin/fsck/pass4.c     | 10 +++++-----
 sbin/fsck/pass5.c     |  4 ++--
 sbin/fsck/preen.c     | 18 +++++++++---------
 sbin/fsck/setup.c     | 10 +++++-----
 sbin/fsck/utilities.c | 18 +++++++++---------
 11 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/sbin/fsck/dir.c b/sbin/fsck/dir.c
index 674d633851..e923f3eead 100644
--- a/sbin/fsck/dir.c
+++ b/sbin/fsck/dir.c
@@ -32,7 +32,7 @@
  *
  * @(#)dir.c	8.8 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/dir.c,v 1.15 1999/08/28 00:12:45 peter Exp $
- * $DragonFly: src/sbin/fsck/dir.c,v 1.7 2004/12/18 21:43:38 swildner Exp $
+ * $DragonFly: src/sbin/fsck/dir.c,v 1.8 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -74,7 +74,7 @@ static int mkentry(struct inodesc *);
 void
 propagate(void)
 {
-	register struct inoinfo **inpp, *inp;
+	struct inoinfo **inpp, *inp;
 	struct inoinfo **inpend;
 	long change;
 
@@ -98,10 +98,10 @@ propagate(void)
  * Scan each entry in a directory block.
  */
 int
-dirscan(register struct inodesc *idesc)
+dirscan(struct inodesc *idesc)
 {
-	register struct direct *dp;
-	register struct bufarea *bp;
+	struct direct *dp;
+	struct bufarea *bp;
 	unsigned int dsize, n;
 	long blksiz;
 	char dbuf[DIRBLKSIZ];
@@ -161,10 +161,10 @@ dirscan(register struct inodesc *idesc)
  * get next entry in a directory.
  */
 static struct direct *
-fsck_readdir(register struct inodesc *idesc)
+fsck_readdir(struct inodesc *idesc)
 {
-	register struct direct *dp, *ndp;
-	register struct bufarea *bp;
+	struct direct *dp, *ndp;
+	struct bufarea *bp;
 	long size, blksiz, fix, dploc;
 
 	blksiz = idesc->id_numfrags * sblock.fs_fsize;
@@ -222,10 +222,10 @@ dpok:
  * This is a superset of the checks made in the kernel.
  */
 static int
-dircheck(struct inodesc *idesc, register struct direct *dp)
+dircheck(struct inodesc *idesc, struct direct *dp)
 {
-	register int size;
-	register char *cp;
+	int size;
+	char *cp;
 	u_char namlen, type;
 	int spaceleft;
 
@@ -272,7 +272,7 @@ direrror(ino_t ino, char *errmesg)
 void
 fileerror(ino_t cwd, ino_t ino, char *errmesg)
 {
-	register struct dinode *dp;
+	struct dinode *dp;
 	char pathbuf[MAXPATHLEN + 1];
 
 	pwarn("%s ", errmesg);
@@ -292,7 +292,7 @@ fileerror(ino_t cwd, ino_t ino, char *errmesg)
 }
 
 void
-adjust(register struct inodesc *idesc, int lcnt)
+adjust(struct inodesc *idesc, int lcnt)
 {
 	struct dinode *dp;
 	int saveresolved;
@@ -351,7 +351,7 @@ adjust(register struct inodesc *idesc, int lcnt)
 static int
 mkentry(struct inodesc *idesc)
 {
-	register struct direct *dirp = idesc->id_dirp;
+	struct direct *dirp = idesc->id_dirp;
 	struct direct newent;
 	int newlen, oldlen;
 
@@ -395,7 +395,7 @@ mkentry(struct inodesc *idesc)
 static int
 chgino(struct inodesc *idesc)
 {
-	register struct direct *dirp = idesc->id_dirp;
+	struct direct *dirp = idesc->id_dirp;
 
 	if (memcmp(dirp->d_name, idesc->id_name, (int)dirp->d_namlen + 1))
 		return (KEEPON);
@@ -410,7 +410,7 @@ chgino(struct inodesc *idesc)
 int
 linkup(ino_t orphan, ino_t parentdir, char *name)
 {
-	register struct dinode *dp;
+	struct dinode *dp;
 	int lostdir;
 	ino_t oldlfdir;
 	struct inodesc idesc;
@@ -575,10 +575,10 @@ makeentry(ino_t parent, ino_t ino, char *name)
  * Attempt to expand the size of a directory
  */
 static int
-expanddir(register struct dinode *dp, char *name)
+expanddir(struct dinode *dp, char *name)
 {
 	ufs_daddr_t lastbn, newblk;
-	register struct bufarea *bp;
+	struct bufarea *bp;
 	char *cp, firstblk[DIRBLKSIZ];
 
 	lastbn = lblkno(&sblock, dp->di_size);
@@ -635,7 +635,7 @@ allocdir(ino_t parent, ino_t request, int mode)
 	ino_t ino;
 	char *cp;
 	struct dinode *dp;
-	register struct bufarea *bp;
+	struct bufarea *bp;
 	struct dirtemplate *dirp;
 
 	ino = allocino(request, IFDIR|mode);
@@ -703,8 +703,8 @@ freedir(ino_t ino, ino_t parent)
 static int
 lftempname(char *bufp, ino_t ino)
 {
-	register ino_t in;
-	register char *cp;
+	ino_t in;
+	char *cp;
 	int namlen;
 
 	cp = bufp + 2;
diff --git a/sbin/fsck/inode.c b/sbin/fsck/inode.c
index 5e17c8076d..4c89dedee1 100644
--- a/sbin/fsck/inode.c
+++ b/sbin/fsck/inode.c
@@ -32,7 +32,7 @@
  *
  * @(#)inode.c	8.8 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/inode.c,v 1.20 2000/02/28 20:02:41 mckusick Exp $
- * $DragonFly: src/sbin/fsck/inode.c,v 1.7 2004/12/18 21:43:38 swildner Exp $
+ * $DragonFly: src/sbin/fsck/inode.c,v 1.8 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -53,7 +53,7 @@ static ino_t startinum;
 static int iblock(struct inodesc *, long ilevel, quad_t isize);
 
 int
-ckinode(struct dinode *dp, register struct inodesc *idesc)
+ckinode(struct dinode *dp, struct inodesc *idesc)
 {
 	ufs_daddr_t *ap;
 	int ret;
@@ -227,7 +227,7 @@ iblock(struct inodesc *idesc, long ilevel, quad_t isize)
 int
 chkrange(ufs_daddr_t blk, int cnt)
 {
-	register int c;
+	int c;
 
 	if (cnt <= 0 || blk <= 0 || blk > maxfsblock ||
 	    cnt - 1 > maxfsblock - blk)
@@ -367,9 +367,9 @@ freeinodebuf(void)
  * Enter inodes into the cache.
  */
 void
-cacheino(register struct dinode *dp, ino_t inumber)
+cacheino(struct dinode *dp, ino_t inumber)
 {
-	register struct inoinfo *inp;
+	struct inoinfo *inp;
 	struct inoinfo **inpp;
 	int blks;
 
@@ -405,7 +405,7 @@ cacheino(register struct dinode *dp, ino_t inumber)
 struct inoinfo *
 getinoinfo(ino_t inumber)
 {
-	register struct inoinfo *inp;
+	struct inoinfo *inp;
 
 	for (inp = inphead[inumber % dirhash]; inp; inp = inp->i_nexthash) {
 		if (inp->i_number != inumber)
@@ -422,7 +422,7 @@ getinoinfo(ino_t inumber)
 void
 inocleanup(void)
 {
-	register struct inoinfo **inpp;
+	struct inoinfo **inpp;
 
 	if (inphead == NULL)
 		return;
@@ -441,9 +441,9 @@ inodirty(void)
 }
 
 void
-clri(register struct inodesc *idesc, char *type, int flag)
+clri(struct inodesc *idesc, char *type, int flag)
 {
-	register struct dinode *dp;
+	struct dinode *dp;
 
 	dp = ginode(idesc->id_number);
 	if (flag == 1) {
@@ -465,7 +465,7 @@ clri(register struct inodesc *idesc, char *type, int flag)
 int
 findname(struct inodesc *idesc)
 {
-	register struct direct *dirp = idesc->id_dirp;
+	struct direct *dirp = idesc->id_dirp;
 
 	if (dirp->d_ino != idesc->id_parent || idesc->id_entryno < 2) {
 		idesc->id_entryno++;
@@ -478,7 +478,7 @@ findname(struct inodesc *idesc)
 int
 findino(struct inodesc *idesc)
 {
-	register struct direct *dirp = idesc->id_dirp;
+	struct direct *dirp = idesc->id_dirp;
 
 	if (dirp->d_ino == 0)
 		return (KEEPON);
@@ -493,7 +493,7 @@ findino(struct inodesc *idesc)
 int
 clearentry(struct inodesc *idesc)
 {
-	register struct direct *dirp = idesc->id_dirp;
+	struct direct *dirp = idesc->id_dirp;
 
 	if (dirp->d_ino != idesc->id_parent || idesc->id_entryno < 2) {
 		idesc->id_entryno++;
@@ -506,8 +506,8 @@ clearentry(struct inodesc *idesc)
 void
 pinode(ino_t ino)
 {
-	register struct dinode *dp;
-	register char *p;
+	struct dinode *dp;
+	char *p;
 	struct passwd *pw;
 	time_t t;
 
@@ -561,8 +561,8 @@ blkerror(ino_t ino, char *type, ufs_daddr_t blk)
 ino_t
 allocino(ino_t request, int type)
 {
-	register ino_t ino;
-	register struct dinode *dp;
+	ino_t ino;
+	struct dinode *dp;
 	struct cg *cgp = &cgrp;
 	int cg;
 
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c
index b2e3ba942b..0259e730bc 100644
--- a/sbin/fsck/main.c
+++ b/sbin/fsck/main.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1986, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.6 (Berkeley) 5/14/95
  * $FreeBSD: src/sbin/fsck/main.c,v 1.21.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/main.c,v 1.8 2004/12/18 21:43:38 swildner Exp $
+ * $DragonFly: src/sbin/fsck/main.c,v 1.9 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -168,7 +168,7 @@ argtoi(int flag, char *req, char *str, int base)
  * Determine whether a filesystem should be checked.
  */
 static int
-docheck(register struct fstab *fsp)
+docheck(struct fstab *fsp)
 {
 
 	if (strcmp(fsp->fs_vfstype, "ufs") ||
diff --git a/sbin/fsck/pass1.c b/sbin/fsck/pass1.c
index 42dd1512e4..3d077896a3 100644
--- a/sbin/fsck/pass1.c
+++ b/sbin/fsck/pass1.c
@@ -32,7 +32,7 @@
  *
  * @(#)pass1.c	8.6 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass1.c,v 1.16.2.5 2002/06/23 22:34:58 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass1.c,v 1.6 2004/12/18 21:43:38 swildner Exp $
+ * $DragonFly: src/sbin/fsck/pass1.c,v 1.7 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -172,11 +172,9 @@ pass1(void)
 }
 
 static void
-checkinode(inumber, idesc)
-	ino_t inumber;
-	register struct inodesc *idesc;
+checkinode(ino_t inumber, struct inodesc *idesc)
 {
-	register struct dinode *dp;
+	struct dinode *dp;
 	struct zlncnt *zlnp;
 	u_int64_t kernmaxfilesize;
 	ufs_daddr_t ndb, j;
@@ -348,12 +346,12 @@ unknown:
 }
 
 int
-pass1check(register struct inodesc *idesc)
+pass1check(struct inodesc *idesc)
 {
 	int res = KEEPON;
 	int anyout, nfrags;
 	ufs_daddr_t blkno = idesc->id_blkno;
-	register struct dups *dlp;
+	struct dups *dlp;
 	struct dups *new;
 
 	if ((anyout = chkrange(blkno, idesc->id_numfrags)) != 0) {
diff --git a/sbin/fsck/pass1b.c b/sbin/fsck/pass1b.c
index 2d01355de3..a3adc03d51 100644
--- a/sbin/fsck/pass1b.c
+++ b/sbin/fsck/pass1b.c
@@ -32,7 +32,7 @@
  *
  * @(#)pass1b.c	8.4 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass1b.c,v 1.7.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass1b.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $
+ * $DragonFly: src/sbin/fsck/pass1b.c,v 1.6 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -50,8 +50,8 @@ static int pass1bcheck(struct inodesc *);
 void
 pass1b(void)
 {
-	register int c, i;
-	register struct dinode *dp;
+	int c, i;
+	struct dinode *dp;
 	struct inodesc idesc;
 	ino_t inumber;
 
@@ -82,9 +82,9 @@ pass1b(void)
 }
 
 static int
-pass1bcheck(register struct inodesc *idesc)
+pass1bcheck(struct inodesc *idesc)
 {
-	register struct dups *dlp;
+	struct dups *dlp;
 	int nfrags, res = KEEPON;
 	ufs_daddr_t blkno = idesc->id_blkno;
 
diff --git a/sbin/fsck/pass2.c b/sbin/fsck/pass2.c
index 9b020fafef..515fe02d79 100644
--- a/sbin/fsck/pass2.c
+++ b/sbin/fsck/pass2.c
@@ -32,7 +32,7 @@
  *
  * @(#)pass2.c	8.9 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass2.c,v 1.10.2.2 2001/11/24 15:14:59 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass2.c,v 1.7 2004/12/18 21:43:38 swildner Exp $
+ * $DragonFly: src/sbin/fsck/pass2.c,v 1.8 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -53,8 +53,8 @@ static int pass2check(struct inodesc *);
 void
 pass2(void)
 {
-	register struct dinode *dp;
-	register struct inoinfo **inpp, *inp;
+	struct dinode *dp;
+	struct inoinfo **inpp, *inp;
 	struct inoinfo **inpend;
 	struct inodesc curino;
 	struct dinode dino;
@@ -217,8 +217,8 @@ pass2(void)
 static int
 pass2check(struct inodesc *idesc)
 {
-	register struct direct *dirp = idesc->id_dirp;
-	register struct inoinfo *inp;
+	struct direct *dirp = idesc->id_dirp;
+	struct inoinfo *inp;
 	int n, entrysize, ret = 0;
 	struct dinode *dp;
 	char *errmsg;
diff --git a/sbin/fsck/pass4.c b/sbin/fsck/pass4.c
index a6041dc903..fa89dddcdf 100644
--- a/sbin/fsck/pass4.c
+++ b/sbin/fsck/pass4.c
@@ -32,7 +32,7 @@
  *
  * @(#)pass4.c	8.4 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass4.c,v 1.7.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/pass4.c,v 1.4 2003/09/28 14:39:17 hmp Exp $
+ * $DragonFly: src/sbin/fsck/pass4.c,v 1.5 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -48,8 +48,8 @@
 void
 pass4(void)
 {
-	register ino_t inumber;
-	register struct zlncnt *zlnp;
+	ino_t inumber;
+	struct zlncnt *zlnp;
 	struct dinode *dp;
 	struct inodesc idesc;
 	int i, n, cg;
@@ -117,9 +117,9 @@ pass4(void)
 }
 
 int
-pass4check(register struct inodesc *idesc)
+pass4check(struct inodesc *idesc)
 {
-	register struct dups *dlp;
+	struct dups *dlp;
 	int nfrags, res = KEEPON;
 	ufs_daddr_t blkno = idesc->id_blkno;
 
diff --git a/sbin/fsck/pass5.c b/sbin/fsck/pass5.c
index f85a84ec79..9ea40e4579 100644
--- a/sbin/fsck/pass5.c
+++ b/sbin/fsck/pass5.c
@@ -32,7 +32,7 @@
  *
  * @(#)pass5.c	8.9 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/pass5.c,v 1.17.2.2 2002/11/26 04:46:59 julian Exp $
- * $DragonFly: src/sbin/fsck/pass5.c,v 1.4 2003/09/28 14:39:17 hmp Exp $
+ * $DragonFly: src/sbin/fsck/pass5.c,v 1.5 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@ pass5(void)
 	struct csum cstotal;
 	struct inodesc idesc[3];
 	char buf[MAXBSIZE];
-	register struct cg *newcg = (struct cg *)buf;
+	struct cg *newcg = (struct cg *)buf;
 	struct ocg *ocg = (struct ocg *)buf;
 
 	inoinfo(WINO)->ino_state = USTATE;
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index 8e2831eb29..05df069161 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -32,7 +32,7 @@
  *
  * @(#)preen.c	8.5 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/preen.c,v 1.16 1999/12/30 16:32:40 peter Exp $
- * $DragonFly: src/sbin/fsck/preen.c,v 1.8 2004/12/18 21:43:38 swildner Exp $
+ * $DragonFly: src/sbin/fsck/preen.c,v 1.9 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -73,9 +73,9 @@ int
 checkfstab(int preen, int maxrun, int (*docheck)(struct fstab *),
            int (*chkit)(char *, char *, long, int))
 {
-	register struct fstab *fsp;
-	register struct disk *dk, *nextdisk;
-	register struct part *pt;
+	struct fstab *fsp;
+	struct disk *dk, *nextdisk;
+	struct part *pt;
 	int ret, pid, retcode, passno, sumstatus, status;
 	long auxdata;
 	char *name;
@@ -196,8 +196,8 @@ checkfstab(int preen, int maxrun, int (*docheck)(struct fstab *),
 static struct disk *
 finddisk(char *name)
 {
-	register struct disk *dk, **dkp;
-	register char *p;
+	struct disk *dk, **dkp;
+	char *p;
 	size_t len;
 
 	p = strrchr(name, '/');
@@ -234,7 +234,7 @@ static void
 addpart(char *name, char *fsname, long auxdata)
 {
 	struct disk *dk = finddisk(name);
-	register struct part *pt, **ppt = &dk->part;
+	struct part *pt, **ppt = &dk->part;
 
 	for (pt = dk->part; pt; ppt = &pt->next, pt = pt->next)
 		if (strcmp(pt->name, name) == 0) {
@@ -261,9 +261,9 @@ addpart(char *name, char *fsname, long auxdata)
 }
 
 static int
-startdisk(register struct disk *dk, int (*checkit)(char *, char *, long ,int))
+startdisk(struct disk *dk, int (*checkit)(char *, char *, long ,int))
 {
-	register struct part *pt = dk->part;
+	struct part *pt = dk->part;
 
 	dk->pid = fork();
 	if (dk->pid < 0) {
diff --git a/sbin/fsck/setup.c b/sbin/fsck/setup.c
index 8c242b5ddc..a927770add 100644
--- a/sbin/fsck/setup.c
+++ b/sbin/fsck/setup.c
@@ -32,7 +32,7 @@
  *
  * @(#)setup.c	8.10 (Berkeley) 5/9/95
  * $FreeBSD: src/sbin/fsck/setup.c,v 1.17.2.4 2002/06/24 05:10:41 dillon Exp $
- * $DragonFly: src/sbin/fsck/setup.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $
+ * $DragonFly: src/sbin/fsck/setup.c,v 1.6 2005/11/06 12:13:53 swildner Exp $
  */
 
 #define DKTYPENAMES
@@ -406,11 +406,11 @@ badsb(int listerr, char *s)
  * their needed information is available!
  */
 static int
-calcsb(char *dev, int devfd, register struct fs *fs)
+calcsb(char *dev, int devfd, struct fs *fs)
 {
-	register struct disklabel *lp;
-	register struct partition *pp;
-	register char *cp;
+	struct disklabel *lp;
+	struct partition *pp;
+	char *cp;
 	int i;
 
 	cp = strchr(dev, '\0') - 1;
diff --git a/sbin/fsck/utilities.c b/sbin/fsck/utilities.c
index 46aa663bdb..efede8622d 100644
--- a/sbin/fsck/utilities.c
+++ b/sbin/fsck/utilities.c
@@ -32,7 +32,7 @@
  *
  * @(#)utilities.c	8.6 (Berkeley) 5/19/95
  * $FreeBSD: src/sbin/fsck/utilities.c,v 1.11.2.3 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/utilities.c,v 1.7 2004/12/18 21:43:38 swildner Exp $
+ * $DragonFly: src/sbin/fsck/utilities.c,v 1.8 2005/11/06 12:13:53 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -133,7 +133,7 @@ inoinfo(ino_t inum)
 void
 bufinit(void)
 {
-	register struct bufarea *bp;
+	struct bufarea *bp;
 	long bufcnt, i;
 	char *bufp;
 
@@ -171,7 +171,7 @@ bufinit(void)
 struct bufarea *
 getdatablk(ufs_daddr_t blkno, long size)
 {
-	register struct bufarea *bp;
+	struct bufarea *bp;
 
 	for (bp = bufhead.b_next; bp != &bufhead; bp = bp->b_next)
 		if (bp->b_bno == fsbtodb(&sblock, blkno))
@@ -196,7 +196,7 @@ foundit:
 }
 
 void
-getblk(register struct bufarea *bp, ufs_daddr_t blk, long size)
+getblk(struct bufarea *bp, ufs_daddr_t blk, long size)
 {
 	ufs_daddr_t dblk;
 
@@ -211,9 +211,9 @@ getblk(register struct bufarea *bp, ufs_daddr_t blk, long size)
 }
 
 void
-flush(int fd, register struct bufarea *bp)
+flush(int fd, struct bufarea *bp)
 {
-	register int i, j;
+	int i, j;
 
 	if (!bp->b_dirty)
 		return;
@@ -248,7 +248,7 @@ rwerror(char *mesg, ufs_daddr_t blk)
 void
 ckfini(int markclean)
 {
-	register struct bufarea *bp, *nbp;
+	struct bufarea *bp, *nbp;
 	int ofsmodified, cnt = 0;
 
 	if (fswritefd < 0) {
@@ -428,7 +428,7 @@ void
 getpathname(char *namebuf, ino_t curdir, ino_t ino)
 {
 	int len;
-	register char *cp;
+	char *cp;
 	struct inodesc idesc;
 	static int busy = 0;
 
@@ -527,7 +527,7 @@ infohandler(int sig)
  * determine whether an inode should be fixed.
  */
 int
-dofix(register struct inodesc *idesc, char *msg)
+dofix(struct inodesc *idesc, char *msg)
 {
 
 	switch (idesc->id_fix) {
-- 
2.41.0