From: Liam J. Foy Date: Mon, 27 Dec 2004 22:36:37 +0000 (+0000) Subject: - Clean sbin/dump of all registers. X-Git-Tag: v2.0.1~9383 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/f5a107fe6f8f848d189101333b444e9709a87a22 - Clean sbin/dump of all registers. Submitted by: Steve Mynott --- diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index b7b2d47325..08983190d5 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -32,7 +32,7 @@ * * @(#)dumprmt.c 8.3 (Berkeley) 4/28/95 * $FreeBSD: src/sbin/dump/dumprmt.c,v 1.14.2.1 2000/07/01 06:31:52 ps Exp $ - * $DragonFly: src/sbin/dump/dumprmt.c,v 1.6 2004/12/18 21:43:38 swildner Exp $ + * $DragonFly: src/sbin/dump/dumprmt.c,v 1.7 2004/12/27 22:36:37 liamfoy Exp $ */ #include @@ -136,8 +136,8 @@ rmtconnaborted(void) void rmtgetconn(void) { - register char *cp; - register const char *rmt; + char *cp; + const char *rmt; static struct servent *sp = NULL; static struct passwd *pwd = NULL; char *tuser; @@ -203,8 +203,8 @@ rmtgetconn(void) static int okname(char *cp0) { - register char *cp; - register int c; + char *cp; + int c; for (cp = cp0; *cp; cp++) { c = *cp; @@ -303,8 +303,8 @@ struct mtget mts; struct mtget * rmtstatus(void) { - register int i; - register char *cp; + int i; + char *cp; if (rmtstate != TS_OPEN) return (NULL); @@ -337,7 +337,7 @@ rmtcall(char *cmd, char *buf) static int rmtreply(char *cmd) { - register char *cp; + char *cp; char code[30], emsg[BUFSIZ]; rmtgets(code, sizeof (code)); @@ -376,7 +376,7 @@ rmtgetb(void) void rmtgets(char *line, int len) { - register char *cp = line; + char *cp = line; while (len > 1) { *cp = rmtgetb(); diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index 6b5c94f8bb..2ddceb2aa1 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -32,7 +32,7 @@ * * @(#)itime.c 8.1 (Berkeley) 6/5/93 * $FreeBSD: src/sbin/dump/itime.c,v 1.3.2.1 2001/08/01 06:29:35 obrien Exp $ - * $DragonFly: src/sbin/dump/itime.c,v 1.6 2004/12/18 21:43:38 swildner Exp $ + * $DragonFly: src/sbin/dump/itime.c,v 1.7 2004/12/27 22:36:37 liamfoy Exp $ */ #include @@ -109,8 +109,8 @@ initdumptimes(void) static void readdumptimes(FILE *df) { - register int i; - register struct dumptime *dtwalk; + int i; + struct dumptime *dtwalk; for (;;) { dtwalk = (struct dumptime *)calloc(1, sizeof (struct dumptime)); @@ -135,8 +135,8 @@ readdumptimes(FILE *df) void getdumptime(void) { - register struct dumpdates *ddp; - register int i; + struct dumpdates *ddp; + int i; char *fname; fname = disk; @@ -168,8 +168,8 @@ void putdumptime(void) { FILE *df; - register struct dumpdates *dtwalk; - register int i; + struct dumpdates *dtwalk; + int i; int fd; char *fname; diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 6ac97619df..fcb1cb9a47 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1991, 1993, 1994 The Regents of the University of California. All rights reserved. * @(#)main.c 8.6 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/dump/main.c,v 1.20.2.9 2003/01/25 18:54:59 dillon Exp $ - * $DragonFly: src/sbin/dump/main.c,v 1.8 2004/12/18 21:43:38 swildner Exp $ + * $DragonFly: src/sbin/dump/main.c,v 1.9 2004/12/27 22:36:37 liamfoy Exp $ */ #include @@ -88,12 +88,12 @@ int main(int argc, char **argv) { struct stat sb; - register ino_t ino; - register int dirty; - register struct dinode *dp; - register struct fstab *dt; - register char *map; - register int ch; + ino_t ino; + int dirty; + struct dinode *dp; + struct fstab *dt; + char *map; + int ch; int i, anydirskipped, bflag = 0, Tflag = 0, honorlevel = 1; int just_estimate = 0; ino_t maxino; diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index f67ca4d472..27fe421994 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -32,7 +32,7 @@ * * @(#)optr.c 8.2 (Berkeley) 1/6/94 * $FreeBSD: src/sbin/dump/optr.c,v 1.9.2.5 2002/02/23 22:32:51 iedowse Exp $ - * $DragonFly: src/sbin/dump/optr.c,v 1.5 2004/12/18 21:43:38 swildner Exp $ + * $DragonFly: src/sbin/dump/optr.c,v 1.6 2004/12/27 22:36:37 liamfoy Exp $ */ #include @@ -264,9 +264,9 @@ quit(const char *fmt, ...) */ struct fstab * -allocfsent(register struct fstab *fs) +allocfsent(struct fstab *fs) { - register struct fstab *new; + struct fstab *new; new = (struct fstab *)malloc(sizeof (*fs)); if (new == NULL || @@ -289,8 +289,8 @@ static SLIST_HEAD(, pfstab) table; void getfstab(void) { - register struct fstab *fs; - register struct pfstab *pf; + struct fstab *fs; + struct pfstab *pf; if (setfsent() == 0) { msg("Can't open %s for dump table information: %s\n", @@ -320,8 +320,8 @@ getfstab(void) struct fstab * fstabsearch(char *key) { - register struct pfstab *pf; - register struct fstab *fs; + struct pfstab *pf; + struct fstab *fs; char *rn; SLIST_FOREACH(pf, &table, pf_list) { @@ -352,9 +352,9 @@ fstabsearch(char *key) void lastdump(int arg) { - register int i; - register struct fstab *dt; - register struct dumpdates *dtwalk; + int i; + struct fstab *dt; + struct dumpdates *dtwalk; char *lastname, *date; int dumpme; time_t tnow; diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 1848a506b1..78276ec6f7 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -32,7 +32,7 @@ * * @(#)tape.c 8.4 (Berkeley) 5/1/95 * $FreeBSD: src/sbin/dump/tape.c,v 1.12.2.3 2002/02/23 22:32:51 iedowse Exp $ - * $DragonFly: src/sbin/dump/tape.c,v 1.7 2004/12/18 21:43:38 swildner Exp $ + * $DragonFly: src/sbin/dump/tape.c,v 1.8 2004/12/27 22:36:37 liamfoy Exp $ */ #include @@ -392,8 +392,8 @@ close_rewind(void) void rollforward(void) { - register struct req *p, *q, *prev; - register struct slave *tslp; + struct req *p, *q, *prev; + struct slave *tslp; int i, size, savedtapea, got; union u_spcl *ntb, *otb; tslp = &slaves[SLAVES]; @@ -683,7 +683,7 @@ void enslave(void) { int cmd[2]; - register int i, j; + int i, j; master = getpid(); @@ -726,7 +726,7 @@ enslave(void) void killall(void) { - register int i; + int i; for (i = 0; i < SLAVES; i++) if (slaves[i].pid > 0) { @@ -743,9 +743,9 @@ killall(void) * get the lock back for the next cycle by swapping descriptors. */ static void -doslave(register int cmd, int slave_number) +doslave(int cmd, int slave_number) { - register int nread; + int nread; int nextslave, size, wrote = 0, eot_count; /* @@ -767,7 +767,7 @@ doslave(register int cmd, int slave_number) * Get list of blocks to dump, read the blocks into tape buffer */ while ((nread = atomic(read, cmd, (char *)slp->req, reqsiz)) == reqsiz) { - register struct req *p = slp->req; + struct req *p = slp->req; for (trecno = 0; trecno < ntrec; trecno += p->count, p += p->count) { diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 725d1ee69d..6f4443763d 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -32,7 +32,7 @@ * * @(#)traverse.c 8.7 (Berkeley) 6/15/95 * $FreeBSD: src/sbin/dump/traverse.c,v 1.10.2.6 2003/04/14 20:10:35 johan Exp $ - * $DragonFly: src/sbin/dump/traverse.c,v 1.7 2004/02/04 17:39:59 joerg Exp $ + * $DragonFly: src/sbin/dump/traverse.c,v 1.8 2004/12/27 22:36:37 liamfoy Exp $ */ #include @@ -84,7 +84,7 @@ static int searchdir(ino_t ino, daddr_t blkno, long size, long filesize, * hence the estimate may be high. */ long -blockest(register struct dinode *dp) +blockest(struct dinode *dp) { long blkest, sizeest; @@ -138,9 +138,9 @@ blockest(register struct dinode *dp) int mapfiles(ino_t maxino, long *tapesize) { - register int mode; - register ino_t ino; - register struct dinode *dp; + int mode; + ino_t ino; + struct dinode *dp; int anydirskipped = 0; for (ino = ROOTINO; ino < maxino; ino++) { @@ -193,10 +193,10 @@ mapfiles(ino_t maxino, long *tapesize) int mapdirs(ino_t maxino, long *tapesize) { - register struct dinode *dp; - register int i, isdir, nodump; - register char *map; - register ino_t ino; + struct dinode *dp; + int i, isdir, nodump; + char *map; + ino_t ino; struct dinode di; long filesize; int ret, change = 0; @@ -265,7 +265,7 @@ dirindir(ino_t ino, daddr_t blkno, int ind_level, long *filesize, long *tapesize, int nodump) { int ret = 0; - register int i; + int i; daddr_t idblk[MAXNINDIR]; bread(fsbtodb(sblock, blkno), (char *)idblk, (int)sblock->fs_bsize); @@ -298,12 +298,12 @@ dirindir(ino_t ino, daddr_t blkno, int ind_level, long *filesize, * contains any subdirectories. */ static int -searchdir(ino_t ino, daddr_t blkno, register long size, long filesize, +searchdir(ino_t ino, daddr_t blkno, long size, long filesize, long *tapesize, int nodump) { - register struct direct *dp; - register struct dinode *ip; - register long loc, ret = 0; + struct direct *dp; + struct dinode *ip; + long loc, ret = 0; char dblk[MAXBSIZE]; bread(fsbtodb(sblock, blkno), dblk, (int)size); @@ -358,7 +358,7 @@ searchdir(ino_t ino, daddr_t blkno, register long size, long filesize, * Dump the contents of an inode to tape. */ void -dumpino(register struct dinode *dp, ino_t ino) +dumpino(struct dinode *dp, ino_t ino) { int ind_level, cnt; fsizeT size; @@ -465,7 +465,7 @@ dmpindir(ino_t ino, daddr_t blk, int ind_level, fsizeT *size) void blksout(daddr_t *blkp, int frags, ino_t ino) { - register daddr_t *bp; + daddr_t *bp; int i, j, count, blks, tbperdb; blks = howmany(frags * sblock->fs_fsize, TP_BSIZE); @@ -500,7 +500,7 @@ blksout(daddr_t *blkp, int frags, ino_t ino) void dumpmap(char *map, int type, ino_t ino) { - register int i; + int i; char *cp; spcl.c_type = type; @@ -516,7 +516,7 @@ dumpmap(char *map, int type, ino_t ino) void writeheader(ino_t ino) { - register int32_t sum, cnt, *lp; + int32_t sum, cnt, *lp; spcl.c_inumber = ino; spcl.c_magic = NFS_MAGIC;