diff options
author | obrien <obrien@FreeBSD.org> | 2002-03-20 17:55:10 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2002-03-20 17:55:10 +0000 |
commit | 73c6870b18b8289171acd66d63bdd7ce8fb819b6 (patch) | |
tree | c6081460d17e593ae6ed744bc0f22972f9c9e461 /sbin/fsck_ffs | |
parent | b132efc524eb66518b26bf553bd07698212a0838 (diff) | |
download | FreeBSD-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_ffs')
-rw-r--r-- | sbin/fsck_ffs/dir.c | 38 | ||||
-rw-r--r-- | sbin/fsck_ffs/fsutil.c | 16 | ||||
-rw-r--r-- | sbin/fsck_ffs/inode.c | 30 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass1.c | 8 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass1b.c | 8 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass2.c | 8 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass4.c | 8 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass5.c | 2 | ||||
-rw-r--r-- | sbin/fsck_ffs/preen.c | 16 | ||||
-rw-r--r-- | sbin/fsck_ffs/setup.c | 8 |
10 files changed, 71 insertions, 71 deletions
diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 5bd6b42..3599c2e 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -82,7 +82,7 @@ static int mkentry __P((struct inodesc *)); void propagate() { - register struct inoinfo **inpp, *inp; + struct inoinfo **inpp, *inp; struct inoinfo **inpend; long change; @@ -107,10 +107,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; u_int dsize, n; long blksiz; char dbuf[DIRBLKSIZ]; @@ -171,10 +171,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; @@ -234,10 +234,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; @@ -294,7 +294,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); @@ -315,7 +315,7 @@ fileerror(cwd, ino, errmesg) void adjust(idesc, lcnt) - register struct inodesc *idesc; + struct inodesc *idesc; int lcnt; { struct dinode *dp; @@ -387,7 +387,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; @@ -432,7 +432,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); @@ -450,7 +450,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; @@ -625,11 +625,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); @@ -763,8 +763,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_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 74dda99..1067693 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -147,7 +147,7 @@ inoinfo(inum) void bufinit() { - register struct bufarea *bp; + struct bufarea *bp; long bufcnt, i; char *bufp; @@ -187,7 +187,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)) @@ -213,7 +213,7 @@ foundit: void getblk(bp, blk, size) - register struct bufarea *bp; + struct bufarea *bp; ufs_daddr_t blk; long size; { @@ -232,9 +232,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; @@ -278,7 +278,7 @@ void ckfini(markclean) int markclean; { - register struct bufarea *bp, *nbp; + struct bufarea *bp, *nbp; int ofsmodified, cnt = 0; if (bkgrdflag) { @@ -491,7 +491,7 @@ getpathname(namebuf, curdir, ino) ino_t curdir, ino; { int len; - register char *cp; + char *cp; struct inodesc idesc; static int busy = 0; @@ -570,7 +570,7 @@ catchquit(sig) */ int dofix(idesc, msg) - register struct inodesc *idesc; + struct inodesc *idesc; char *msg; { diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 6305c19..c1713d5 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -60,7 +60,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; @@ -246,7 +246,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) @@ -391,10 +391,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; @@ -431,7 +431,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) @@ -448,7 +448,7 @@ getinoinfo(inumber) void inocleanup() { - register struct inoinfo **inpp; + struct inoinfo **inpp; if (inphead == NULL) return; @@ -468,11 +468,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) { @@ -506,7 +506,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++; @@ -520,7 +520,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); @@ -536,7 +536,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++; @@ -550,8 +550,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; @@ -610,8 +610,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_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 68a343a..58dfc47 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -180,9 +180,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; u_int64_t kernmaxfilesize; ufs_daddr_t ndb, j; @@ -375,12 +375,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_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index 9a37c1d..5aecb92 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/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; @@ -87,9 +87,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_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index c6349dd..b46c3e1 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -58,8 +58,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; @@ -223,8 +223,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_ffs/pass4.c b/sbin/fsck_ffs/pass4.c index 9e9cea5..c6f0aff 100644 --- a/sbin/fsck_ffs/pass4.c +++ b/sbin/fsck_ffs/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; @@ -122,9 +122,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_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 3a48629..5102673 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -66,7 +66,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_ffs/preen.c b/sbin/fsck_ffs/preen.c index 62dc3d8..84ad2a2 100644 --- a/sbin/fsck_ffs/preen.c +++ b/sbin/fsck_ffs/preen.c @@ -81,9 +81,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; @@ -205,8 +205,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, '/'); @@ -245,7 +245,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) { @@ -273,10 +273,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_ffs/setup.c b/sbin/fsck_ffs/setup.c index 47157a2..a33c976 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -510,11 +510,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; |