summaryrefslogtreecommitdiffstats
path: root/sbin/fsck_ifs
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-03-20 17:55:10 +0000
committerobrien <obrien@FreeBSD.org>2002-03-20 17:55:10 +0000
commit73c6870b18b8289171acd66d63bdd7ce8fb819b6 (patch)
treec6081460d17e593ae6ed744bc0f22972f9c9e461 /sbin/fsck_ifs
parentb132efc524eb66518b26bf553bd07698212a0838 (diff)
downloadFreeBSD-src-73c6870b18b8289171acd66d63bdd7ce8fb819b6.zip
FreeBSD-src-73c6870b18b8289171acd66d63bdd7ce8fb819b6.tar.gz
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?)
Diffstat (limited to 'sbin/fsck_ifs')
-rw-r--r--sbin/fsck_ifs/dir.c38
-rw-r--r--sbin/fsck_ifs/fsutil.c16
-rw-r--r--sbin/fsck_ifs/inode.c30
-rw-r--r--sbin/fsck_ifs/pass1.c8
-rw-r--r--sbin/fsck_ifs/pass1b.c8
-rw-r--r--sbin/fsck_ifs/pass2.c8
-rw-r--r--sbin/fsck_ifs/pass4.c8
-rw-r--r--sbin/fsck_ifs/pass5.c2
-rw-r--r--sbin/fsck_ifs/preen.c16
-rw-r--r--sbin/fsck_ifs/setup.c8
10 files changed, 71 insertions, 71 deletions
diff --git a/sbin/fsck_ifs/dir.c b/sbin/fsck_ifs/dir.c
index 5def8b2..ea72ffc 100644
--- a/sbin/fsck_ifs/dir.c
+++ b/sbin/fsck_ifs/dir.c
@@ -78,7 +78,7 @@ static int mkentry __P((struct inodesc *));
void
propagate()
{
- register struct inoinfo **inpp, *inp;
+ struct inoinfo **inpp, *inp;
struct inoinfo **inpend;
long change;
@@ -103,10 +103,10 @@ propagate()
*/
int
dirscan(idesc)
- register struct inodesc *idesc;
+ struct inodesc *idesc;
{
- register struct direct *dp;
- register struct bufarea *bp;
+ struct direct *dp;
+ struct bufarea *bp;
int dsize, n;
long blksiz;
char dbuf[DIRBLKSIZ];
@@ -167,10 +167,10 @@ dirscan(idesc)
*/
static struct direct *
fsck_readdir(idesc)
- register struct inodesc *idesc;
+ 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;
@@ -230,10 +230,10 @@ dpok:
static int
dircheck(idesc, dp)
struct inodesc *idesc;
- register struct direct *dp;
+ struct direct *dp;
{
- register int size;
- register char *cp;
+ int size;
+ char *cp;
u_char namlen, type;
int spaceleft;
@@ -290,7 +290,7 @@ fileerror(cwd, ino, errmesg)
ino_t cwd, ino;
char *errmesg;
{
- register struct dinode *dp;
+ struct dinode *dp;
char pathbuf[MAXPATHLEN + 1];
pwarn("%s ", errmesg);
@@ -311,7 +311,7 @@ fileerror(cwd, ino, errmesg)
void
adjust(idesc, lcnt)
- register struct inodesc *idesc;
+ struct inodesc *idesc;
int lcnt;
{
struct dinode *dp;
@@ -372,7 +372,7 @@ static int
mkentry(idesc)
struct inodesc *idesc;
{
- register struct direct *dirp = idesc->id_dirp;
+ struct direct *dirp = idesc->id_dirp;
struct direct newent;
int newlen, oldlen;
@@ -417,7 +417,7 @@ static int
chgino(idesc)
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);
@@ -435,7 +435,7 @@ linkup(orphan, parentdir, name)
ino_t parentdir;
char *name;
{
- register struct dinode *dp;
+ struct dinode *dp;
int lostdir;
ino_t oldlfdir;
struct inodesc idesc;
@@ -606,11 +606,11 @@ makeentry(parent, ino, name)
*/
static int
expanddir(dp, name)
- register struct dinode *dp;
+ 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);
@@ -744,8 +744,8 @@ lftempname(bufp, ino)
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_ifs/fsutil.c b/sbin/fsck_ifs/fsutil.c
index c510094..1513ada 100644
--- a/sbin/fsck_ifs/fsutil.c
+++ b/sbin/fsck_ifs/fsutil.c
@@ -148,7 +148,7 @@ inoinfo(inum)
void
bufinit()
{
- register struct bufarea *bp;
+ struct bufarea *bp;
long bufcnt, i;
char *bufp;
@@ -188,7 +188,7 @@ getdatablk(blkno, size)
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))
@@ -214,7 +214,7 @@ foundit:
void
getblk(bp, blk, size)
- register struct bufarea *bp;
+ struct bufarea *bp;
ufs_daddr_t blk;
long size;
{
@@ -233,9 +233,9 @@ getblk(bp, blk, size)
void
flush(fd, bp)
int fd;
- register struct bufarea *bp;
+ struct bufarea *bp;
{
- register int i, j;
+ int i, j;
if (!bp->b_dirty)
return;
@@ -273,7 +273,7 @@ void
ckfini(markclean)
int markclean;
{
- register struct bufarea *bp, *nbp;
+ struct bufarea *bp, *nbp;
int ofsmodified, cnt = 0;
if (fswritefd < 0) {
@@ -466,7 +466,7 @@ getpathname(namebuf, curdir, ino)
ino_t curdir, ino;
{
int len;
- register char *cp;
+ char *cp;
struct inodesc idesc;
static int busy = 0;
@@ -559,7 +559,7 @@ voidquit(sig)
*/
int
dofix(idesc, msg)
- register struct inodesc *idesc;
+ struct inodesc *idesc;
char *msg;
{
diff --git a/sbin/fsck_ifs/inode.c b/sbin/fsck_ifs/inode.c
index 8b2f14b..6ec9ea8 100644
--- a/sbin/fsck_ifs/inode.c
+++ b/sbin/fsck_ifs/inode.c
@@ -59,7 +59,7 @@ static int iblock __P((struct inodesc *, long ilevel, quad_t isize));
int
ckinode(dp, idesc)
struct dinode *dp;
- register struct inodesc *idesc;
+ struct inodesc *idesc;
{
ufs_daddr_t *ap;
int ret;
@@ -243,7 +243,7 @@ chkrange(blk, cnt)
ufs_daddr_t blk;
int cnt;
{
- register int c;
+ int c;
if (cnt <= 0 || blk <= 0 || blk > maxfsblock ||
cnt - 1 > maxfsblock - blk)
@@ -388,10 +388,10 @@ freeinodebuf()
*/
void
cacheino(dp, inumber)
- register struct dinode *dp;
+ struct dinode *dp;
ino_t inumber;
{
- register struct inoinfo *inp;
+ struct inoinfo *inp;
struct inoinfo **inpp;
int blks;
@@ -428,7 +428,7 @@ struct inoinfo *
getinoinfo(inumber)
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)
@@ -445,7 +445,7 @@ getinoinfo(inumber)
void
inocleanup()
{
- register struct inoinfo **inpp;
+ struct inoinfo **inpp;
if (inphead == NULL)
return;
@@ -465,11 +465,11 @@ inodirty()
void
clri(idesc, type, flag)
- register struct inodesc *idesc;
+ struct inodesc *idesc;
char *type;
int flag;
{
- register struct dinode *dp;
+ struct dinode *dp;
dp = ginode(idesc->id_number);
if (flag == 1) {
@@ -492,7 +492,7 @@ int
findname(idesc)
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,7 +506,7 @@ int
findino(idesc)
struct inodesc *idesc;
{
- register struct direct *dirp = idesc->id_dirp;
+ struct direct *dirp = idesc->id_dirp;
if (dirp->d_ino == 0)
return (KEEPON);
@@ -522,7 +522,7 @@ int
clearentry(idesc)
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++;
@@ -536,8 +536,8 @@ void
pinode(ino)
ino_t ino;
{
- register struct dinode *dp;
- register char *p;
+ struct dinode *dp;
+ char *p;
struct passwd *pw;
time_t t;
@@ -596,8 +596,8 @@ allocino(request, type)
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_ifs/pass1.c b/sbin/fsck_ifs/pass1.c
index fcd596b..54c51fe 100644
--- a/sbin/fsck_ifs/pass1.c
+++ b/sbin/fsck_ifs/pass1.c
@@ -169,9 +169,9 @@ pass1()
static void
checkinode(inumber, idesc)
ino_t inumber;
- register struct inodesc *idesc;
+ struct inodesc *idesc;
{
- register struct dinode *dp;
+ struct dinode *dp;
struct zlncnt *zlnp;
int ndb, j;
mode_t mode;
@@ -343,12 +343,12 @@ unknown:
int
pass1check(idesc)
- register struct inodesc *idesc;
+ 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 (idesc->id_type == SNAP) {
diff --git a/sbin/fsck_ifs/pass1b.c b/sbin/fsck_ifs/pass1b.c
index 7ef662f..b1fa9b7 100644
--- a/sbin/fsck_ifs/pass1b.c
+++ b/sbin/fsck_ifs/pass1b.c
@@ -54,8 +54,8 @@ static int pass1bcheck __P((struct inodesc *));
void
pass1b()
{
- register int c, i;
- register struct dinode *dp;
+ int c, i;
+ struct dinode *dp;
struct inodesc idesc;
ino_t inumber;
@@ -81,9 +81,9 @@ pass1b()
static int
pass1bcheck(idesc)
- register struct inodesc *idesc;
+ 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_ifs/pass2.c b/sbin/fsck_ifs/pass2.c
index 088ecff..a081c90 100644
--- a/sbin/fsck_ifs/pass2.c
+++ b/sbin/fsck_ifs/pass2.c
@@ -57,8 +57,8 @@ static int pass2check __P((struct inodesc *));
void
pass2()
{
- 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;
@@ -216,8 +216,8 @@ static int
pass2check(idesc)
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_ifs/pass4.c b/sbin/fsck_ifs/pass4.c
index 2a8e43b..42955cf 100644
--- a/sbin/fsck_ifs/pass4.c
+++ b/sbin/fsck_ifs/pass4.c
@@ -52,8 +52,8 @@ static const char rcsid[] =
void
pass4()
{
- register ino_t inumber;
- register struct zlncnt *zlnp;
+ ino_t inumber;
+ struct zlncnt *zlnp;
struct dinode *dp;
struct inodesc idesc;
int i, n, cg;
@@ -119,9 +119,9 @@ pass4()
int
pass4check(idesc)
- register struct inodesc *idesc;
+ 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_ifs/pass5.c b/sbin/fsck_ifs/pass5.c
index a9f4487..b5ef8a8 100644
--- a/sbin/fsck_ifs/pass5.c
+++ b/sbin/fsck_ifs/pass5.c
@@ -63,7 +63,7 @@ pass5()
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_ifs/preen.c b/sbin/fsck_ifs/preen.c
index 3e073c6..17e2245 100644
--- a/sbin/fsck_ifs/preen.c
+++ b/sbin/fsck_ifs/preen.c
@@ -80,9 +80,9 @@ checkfstab(preen, maxrun, docheck, chkit)
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;
@@ -204,8 +204,8 @@ static struct disk *
finddisk(name)
char *name;
{
- register struct disk *dk, **dkp;
- register char *p;
+ struct disk *dk, **dkp;
+ char *p;
size_t len;
p = strrchr(name, '/');
@@ -244,7 +244,7 @@ addpart(name, fsname, auxdata)
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) {
@@ -272,10 +272,10 @@ addpart(name, fsname, auxdata)
static int
startdisk(dk, checkit)
- register struct disk *dk;
+ 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_ifs/setup.c b/sbin/fsck_ifs/setup.c
index 52fb849..6743c27 100644
--- a/sbin/fsck_ifs/setup.c
+++ b/sbin/fsck_ifs/setup.c
@@ -449,11 +449,11 @@ static int
calcsb(dev, devfd, fs)
char *dev;
int devfd;
- register struct fs *fs;
+ 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;
OpenPOWER on IntegriCloud