diff options
52 files changed, 422 insertions, 422 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c index fca0b73f21c..b4d072e24ff 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cat.c,v 1.10 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: cat.c,v 1.11 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: cat.c,v 1.10 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: cat.c,v 1.11 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -127,7 +127,7 @@ void cook_args(argv) char **argv; { - register FILE *fp; + FILE *fp; fp = stdin; filename = "stdin"; @@ -151,9 +151,9 @@ cook_args(argv) void cook_buf(fp) - register FILE *fp; + FILE *fp; { - register int ch, gobble, line, prev; + int ch, gobble, line, prev; line = gobble = 0; for (prev = '\n'; (ch = getc(fp)) != EOF; prev = ch) { @@ -217,7 +217,7 @@ void raw_args(argv) char **argv; { - register int fd; + int fd; fd = fileno(stdin); filename = "stdin"; @@ -241,9 +241,9 @@ raw_args(argv) void raw_cat(rfd) - register int rfd; + int rfd; { - register int nr, nw, off, wfd; + int nr, nw, off, wfd; static int bsize; static char *buf; struct stat sbuf; diff --git a/bin/cp/utils.c b/bin/cp/utils.c index cf33ef608fc..e1213809888 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utils.c,v 1.17 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: utils.c,v 1.18 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94"; #else -static char rcsid[] = "$OpenBSD: utils.c,v 1.17 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: utils.c,v 1.18 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -299,7 +299,7 @@ setfile(fs, fd) int setlink(fs) - register struct stat *fs; + struct stat *fs; { if (lchown(to.p_path, fs->st_uid, fs->st_gid)) { diff --git a/bin/test/test.c b/bin/test/test.c index 362b1f203ff..d6fabb24615 100644 --- a/bin/test/test.c +++ b/bin/test/test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: test.c,v 1.5 1997/09/01 18:30:38 deraadt Exp $ */ +/* $OpenBSD: test.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: test.c,v 1.15 1995/03/21 07:04:06 cgd Exp $ */ /* @@ -12,7 +12,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: test.c,v 1.5 1997/09/01 18:30:38 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: test.c,v 1.6 2001/11/05 07:39:16 mpech Exp $"; #endif #include <sys/types.h> @@ -294,7 +294,7 @@ primary(n) static int binop() { - register const char *opnd1, *opnd2; + const char *opnd1, *opnd2; struct t_op const *op; opnd1 = *t_wp; @@ -419,9 +419,9 @@ filebit: static enum token t_lex(s) - register char *s; + char *s; { - register struct t_op const *op = ops; + struct t_op const *op = ops; if (s == 0) { t_wp_op = NULL; diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c index 2fe03e08d70..8449b77d9dd 100644 --- a/sbin/badsect/badsect.c +++ b/sbin/badsect/badsect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: badsect.c,v 1.5 2001/07/07 18:26:10 deraadt Exp $ */ +/* $OpenBSD: badsect.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: badsect.c,v 1.10 1995/03/18 14:54:28 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: badsect.c,v 1.5 2001/07/07 18:26:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: badsect.c,v 1.6 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -99,7 +99,7 @@ main(argc, argv) { daddr_t number; struct stat stbuf, devstat; - register struct direct *dp; + struct direct *dp; DIR *dirp; char name[BUFSIZ]; int len; diff --git a/sbin/brconfig/brconfig.c b/sbin/brconfig/brconfig.c index 4c1b800b144..599857e2fd9 100644 --- a/sbin/brconfig/brconfig.c +++ b/sbin/brconfig/brconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: brconfig.c,v 1.12 2001/02/27 20:51:21 jason Exp $ */ +/* $OpenBSD: brconfig.c,v 1.13 2001/11/05 07:39:16 mpech Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -1336,8 +1336,8 @@ printb(s, v, bits) char *bits; unsigned short v; { - register int i, any = 0; - register char c; + int i, any = 0; + char c; if (bits && *bits == 8) printf("%s=%o", s, v); diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c index fe664c5f8a7..6537c05a307 100644 --- a/sbin/clri/clri.c +++ b/sbin/clri/clri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clri.c,v 1.5 2001/06/04 14:59:47 mickey Exp $ */ +/* $OpenBSD: clri.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: clri.c,v 1.9 1995/03/18 14:54:33 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)clri.c 8.2 (Berkeley) 9/23/93"; #else -static char rcsid[] = "$OpenBSD: clri.c,v 1.5 2001/06/04 14:59:47 mickey Exp $"; +static char rcsid[] = "$OpenBSD: clri.c,v 1.6 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -70,9 +70,9 @@ main(argc, argv) int argc; char *argv[]; { - register struct fs *sbp; - register struct dinode *ip; - register int fd; + struct fs *sbp; + struct dinode *ip; + int fd; struct dinode ibuf[MAXBSIZE / sizeof (struct dinode)]; int32_t generation; off_t offset; diff --git a/sbin/disklabel/dkcksum.c b/sbin/disklabel/dkcksum.c index 834ff5c838c..adbb69e27f5 100644 --- a/sbin/disklabel/dkcksum.c +++ b/sbin/disklabel/dkcksum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dkcksum.c,v 1.2 1996/06/23 14:30:05 deraadt Exp $ */ +/* $OpenBSD: dkcksum.c,v 1.3 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: dkcksum.c,v 1.6 1995/03/18 14:54:42 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dkcksum.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: dkcksum.c,v 1.2 1996/06/23 14:30:05 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dkcksum.c,v 1.3 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -47,10 +47,10 @@ static char rcsid[] = "$OpenBSD: dkcksum.c,v 1.2 1996/06/23 14:30:05 deraadt Exp u_short dkcksum(lp) - register struct disklabel *lp; + struct disklabel *lp; { - register u_short *start, *end; - register u_short sum = 0; + u_short *start, *end; + u_short sum = 0; start = (u_short *)lp; end = (u_short *)&lp->d_partitions[lp->d_npartitions]; diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index bc3700576bf..84e2523be14 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dmesg.c,v 1.13 2001/07/07 18:26:11 deraadt Exp $ */ +/* $OpenBSD: dmesg.c,v 1.14 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: dmesg.c,v 1.8 1995/03/18 14:54:49 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dmesg.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: dmesg.c,v 1.13 2001/07/07 18:26:11 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dmesg.c,v 1.14 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -80,8 +80,8 @@ main(argc, argv) int argc; char *argv[]; { - register int ch, newl, skip, i; - register char *p; + int ch, newl, skip, i; + char *p; struct msgbuf cur; char *memf, *nlistf, *bufdata; char buf[5]; diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index aebb2a392db..60440087148 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumprmt.c,v 1.14 2001/01/19 17:57:34 deraadt Exp $ */ +/* $OpenBSD: dumprmt.c,v 1.15 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $ */ /*- @@ -120,7 +120,7 @@ rmtconnaborted() void rmtgetconn() { - register char *cp; + char *cp; static struct servent *sp = NULL; static struct passwd *pwd = NULL; static int on = 1; @@ -173,8 +173,8 @@ static int okname(cp0) char *cp0; { - register char *cp; - register int c; + char *cp; + int c; for (cp = cp0; *cp; cp++) { c = *cp; @@ -285,8 +285,8 @@ struct mtget mts; struct mtget * rmtstatus() { - register int i; - register char *cp; + int i; + char *cp; if (rmtstate != TS_OPEN) return (NULL); @@ -322,7 +322,7 @@ static int rmtreply(cmd) char *cmd; { - register char *cp; + char *cp; char code[30], emsg[BUFSIZ]; rmtgets(code, sizeof(code)); @@ -363,7 +363,7 @@ rmtgets(line, len) 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 7d2ef2ede09..8a279c52ddc 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: itime.c,v 1.5 1998/08/07 17:29:24 millert Exp $ */ +/* $OpenBSD: itime.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: itime.c,v 1.4 1997/04/15 01:09:50 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: itime.c,v 1.5 1998/08/07 17:29:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: itime.c,v 1.6 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -114,8 +114,8 @@ static void readdumptimes(df) FILE *df; { - register int i; - register struct dumptime *dtwalk; + int i; + struct dumptime *dtwalk; for (;;) { dtwalk = (struct dumptime *)calloc(1, sizeof(struct dumptime)); @@ -141,8 +141,8 @@ readdumptimes(df) void getdumptime() { - register struct dumpdates *ddp; - register int i; + struct dumpdates *ddp; + int i; char *fname; fname = disk; @@ -174,8 +174,8 @@ void putdumptime() { 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 19fab46782a..900ab39fe01 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.29 2000/10/09 23:19:26 mickey Exp $ */ +/* $OpenBSD: main.c,v 1.30 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $ */ /*- @@ -104,12 +104,12 @@ main(argc, argv) int argc; char *argv[]; { - 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; struct tm then; struct statfs fsbuf; int i, anydirskipped, bflag = 0, Tflag = 0, honorlevel = 1; diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index ab704a3ae52..66ccb918356 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: optr.c,v 1.18 2001/06/13 20:13:28 markus Exp $ */ +/* $OpenBSD: optr.c,v 1.19 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #else -static char rcsid[] = "$OpenBSD: optr.c,v 1.18 2001/06/13 20:13:28 markus Exp $"; +static char rcsid[] = "$OpenBSD: optr.c,v 1.19 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -319,9 +319,9 @@ quit(fmt, va_alist) struct fstab * allocfsent(fs) - register struct fstab *fs; + struct fstab *fs; { - register struct fstab *new; + struct fstab *new; new = (struct fstab *)malloc(sizeof(*fs)); if (new == NULL || @@ -344,8 +344,8 @@ static struct pfstab *table; void getfstab() { - 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", @@ -385,8 +385,8 @@ struct fstab * fstabsearch(key) char *key; { - register struct pfstab *pf; - register struct fstab *fs; + struct pfstab *pf; + struct fstab *fs; char *rn; for (pf = table; pf != NULL; pf = pf->pf_next) { @@ -416,9 +416,9 @@ void lastdump(arg) char arg; /* w ==> just what to do; W ==> most recent dumps */ { - 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 bfeb9509ae9..309c02c54ae 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.11 2001/01/19 17:57:35 deraadt Exp $ */ +/* $OpenBSD: tape.c,v 1.12 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.2 (Berkeley) 3/17/94"; #else -static char rcsid[] = "$OpenBSD: tape.c,v 1.11 2001/01/19 17:57:35 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tape.c,v 1.12 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -452,8 +452,8 @@ close_rewind() void rollforward() { - 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]; @@ -748,7 +748,7 @@ void enslave() { int cmd[2]; - register int i, j; + int i, j; master = getpid(); @@ -792,7 +792,7 @@ enslave() void killall() { - register int i; + int i; for (i = 0; i < SLAVES; i++) if (slaves[i].pid > 0) { @@ -810,10 +810,10 @@ killall() */ static void doslave(cmd, slave_number) - register int cmd; + int cmd; int slave_number; { - register int nread; + int nread; int nextslave, size, eot_count; volatile int wrote; sigset_t sigset; @@ -837,7 +837,7 @@ doslave(cmd, 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 83ada2cb868..409495aaee2 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traverse.c,v 1.6 2000/01/22 20:24:55 deraadt Exp $ */ +/* $OpenBSD: traverse.c,v 1.7 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93"; #else -static char rcsid[] = "$OpenBSD: traverse.c,v 1.6 2000/01/22 20:24:55 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: traverse.c,v 1.7 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -92,7 +92,7 @@ static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize)); */ long blockest(dp) - register struct dinode *dp; + struct dinode *dp; { long blkest, sizeest; @@ -281,10 +281,10 @@ mapdirs(maxino, tapesize) ino_t maxino; u_int64_t *tapesize; { - register struct dinode *dp; - register int i, isdir; - register char *map; - register ino_t ino; + struct dinode *dp; + int i, isdir; + char *map; + ino_t ino; long filesize; int ret, change = 0; @@ -342,7 +342,7 @@ dirindir(ino, blkno, ind_level, filesize) long *filesize; { int ret = 0; - register int i; + int i; daddr_t idblk[MAXNINDIR]; bread(fsbtodb(sblock, blkno), (char *)idblk, (int)sblock->fs_bsize); @@ -377,11 +377,11 @@ static int searchdir(ino, blkno, size, filesize) ino_t ino; daddr_t blkno; - register long size; + long size; long filesize; { - register struct direct *dp; - register long loc, ret = 0; + struct direct *dp; + long loc, ret = 0; char dblk[MAXBSIZE]; bread(fsbtodb(sblock, blkno), dblk, (int)size); @@ -423,7 +423,7 @@ searchdir(ino, blkno, size, filesize) */ void dumpino(dp, ino) - register struct dinode *dp; + struct dinode *dp; ino_t ino; { int ind_level, cnt; @@ -541,7 +541,7 @@ blksout(blkp, frags, ino) 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); @@ -579,7 +579,7 @@ dumpmap(map, type, ino) int type; ino_t ino; { - register int i; + int i; char *cp; spcl.c_type = type; @@ -596,7 +596,7 @@ void writeheader(ino) ino_t ino; { - register int32_t sum, cnt, *lp; + int32_t sum, cnt, *lp; spcl.c_inumber = ino; spcl.c_magic = NFS_MAGIC; diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 9123aa67d42..19e16777ce1 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumpfs.c,v 1.11 2001/04/13 02:39:06 gluk Exp $ */ +/* $OpenBSD: dumpfs.c,v 1.12 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: dumpfs.c,v 1.12 1997/04/26 05:41:33 lukem Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dumpfs.c 8.2 (Berkeley) 2/2/94"; #else -static char rcsid[] = "$OpenBSD: dumpfs.c,v 1.11 2001/04/13 02:39:06 gluk Exp $"; +static char rcsid[] = "$OpenBSD: dumpfs.c,v 1.12 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -87,7 +87,7 @@ main(argc, argv) int argc; char *argv[]; { - register struct fstab *fs; + struct fstab *fs; int ch, eval; while ((ch = getopt(argc, argv, "")) != -1) @@ -330,11 +330,11 @@ dumpcg(name, fd, c) void pbits(vp, max) - register void *vp; + void *vp; int max; { - register int i; - register char *p; + int i; + char *p; int count, j; for (count = i = 0, p = vp; i < max; i++) diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c index dfdaec2f72c..8d792407310 100644 --- a/sbin/fsck/preen.c +++ b/sbin/fsck/preen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: preen.c,v 1.5 1999/01/11 20:59:29 niklas Exp $ */ +/* $OpenBSD: preen.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: preen.c,v 1.15 1996/09/28 19:21:42 christos Exp $ */ /* @@ -323,11 +323,11 @@ addpart(type, devname, mntpt, auxarg) static int startdisk(d, checkit) - register struct diskentry *d; + struct diskentry *d; int (*checkit) __P((const char *, const char *, const char *, void *, pid_t *)); { - register struct partentry *p = d->d_part.tqh_first; + struct partentry *p = d->d_part.tqh_first; int rv; while ((rv = (*checkit)(p->p_type, p->p_devname, p->p_mntpt, diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 52996a6f46a..622b11d032d 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.9 2001/05/28 21:22:47 gluk Exp $ */ +/* $OpenBSD: dir.c,v 1.10 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: dir.c,v 1.20 1996/09/27 22:45:11 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dir.c 8.5 (Berkeley) 12/8/94"; #else -static char rcsid[] = "$OpenBSD: dir.c,v 1.9 2001/05/28 21:22:47 gluk Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.10 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -107,10 +107,10 @@ propagate(inumber) */ 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]; @@ -169,10 +169,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; @@ -232,10 +232,10 @@ dpok: 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; @@ -287,7 +287,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); @@ -308,10 +308,10 @@ fileerror(cwd, ino, errmesg) void adjust(idesc, lcnt) - register struct inodesc *idesc; + struct inodesc *idesc; short lcnt; { - register struct dinode *dp; + struct dinode *dp; dp = ginode(idesc->id_number); if (dp->di_nlink == lcnt) { @@ -342,7 +342,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; @@ -387,7 +387,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); @@ -404,7 +404,7 @@ linkup(orphan, parentdir) ino_t orphan; ino_t parentdir; { - register struct dinode *dp; + struct dinode *dp; int lostdir; ino_t oldlfdir; struct inodesc idesc; @@ -574,11 +574,11 @@ makeentry(parent, ino, name) */ static int expanddir(dp, name) - register struct dinode *dp; + struct dinode *dp; char *name; { daddr_t lastbn, newblk; - register struct bufarea *bp; + struct bufarea *bp; char *cp, firstblk[DIRBLKSIZ]; lastbn = lblkno(&sblock, dp->di_size); @@ -637,7 +637,7 @@ allocdir(parent, request, mode) ino_t ino; char *cp; struct dinode *dp; - register struct bufarea *bp; + struct bufarea *bp; struct dirtemplate *dirp; struct inoinfo *inp; @@ -711,8 +711,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/inode.c b/sbin/fsck_ffs/inode.c index 73908135c03..6b59bd22baf 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inode.c,v 1.17 2001/07/07 18:26:12 deraadt Exp $ */ +/* $OpenBSD: inode.c,v 1.18 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: inode.c,v 1.23 1996/10/11 20:15:47 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)inode.c 8.5 (Berkeley) 2/8/95"; #else -static char rcsid[] = "$OpenBSD: inode.c,v 1.17 2001/07/07 18:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: inode.c,v 1.18 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -65,9 +65,9 @@ static int iblock __P((struct inodesc *, long, u_int64_t)); int ckinode(dp, idesc) struct dinode *dp; - register struct inodesc *idesc; + struct inodesc *idesc; { - register ufs_daddr_t *ap; + ufs_daddr_t *ap; long ret, n, ndb, offset; struct dinode dino; u_int64_t remsize, sizepb; @@ -158,9 +158,9 @@ iblock(idesc, ilevel, isize) long ilevel; u_int64_t isize; { - register daddr_t *ap; - register daddr_t *aplim; - register struct bufarea *bp; + daddr_t *ap; + daddr_t *aplim; + struct bufarea *bp; int i, n, (*func) __P((struct inodesc *)), nif; u_int64_t sizepb; char buf[BUFSIZ]; @@ -244,7 +244,7 @@ chkrange(blk, cnt) daddr_t blk; int cnt; { - register int c; + int c; if ((unsigned)blk > maxfsblock || (unsigned)(blk + cnt) > maxfsblock) return (1); @@ -373,10 +373,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; unsigned int blks; @@ -417,7 +417,7 @@ struct inoinfo * getinoinfo(inumber) ino_t inumber; { - register struct inoinfo *inp; + struct inoinfo *inp; for (inp = inphead[inumber % numdirs]; inp; inp = inp->i_nexthash) { if (inp->i_number != inumber) @@ -434,7 +434,7 @@ getinoinfo(inumber) void inocleanup() { - register struct inoinfo **inpp; + struct inoinfo **inpp; if (inphead == NULL) return; @@ -454,11 +454,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) { @@ -481,7 +481,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) return (KEEPON); @@ -493,7 +493,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); @@ -509,8 +509,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; @@ -571,8 +571,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; time_t t; diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 443048b7ff7..7896b100683 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.18 2001/03/02 08:33:55 art Exp $ */ +/* $OpenBSD: main.c,v 1.19 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.18 2001/03/02 08:33:55 art Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.19 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -168,7 +168,7 @@ argtoi(flag, req, str, base) */ int docheck(fsp) - register struct fstab *fsp; + struct fstab *fsp; { if ((strcmp(fsp->fs_vfstype, "ufs") && diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 8eb9287b78b..5c94218a15d 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1.c,v 1.9 2001/07/07 18:26:12 deraadt Exp $ */ +/* $OpenBSD: pass1.c,v 1.10 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass1.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: pass1.c,v 1.9 2001/07/07 18:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pass1.c,v 1.10 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -120,9 +120,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; @@ -288,12 +288,12 @@ unknown: int pass1check(idesc) - register struct inodesc *idesc; + struct inodesc *idesc; { int res = KEEPON; int anyout, nfrags; 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_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index 88d69f53a29..b2aea2d4778 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1b.c,v 1.4 1999/03/01 07:45:18 d Exp $ */ +/* $OpenBSD: pass1b.c,v 1.5 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: pass1b.c,v 1.10 1996/09/23 16:18:37 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass1b.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: pass1b.c,v 1.4 1999/03/01 07:45:18 d Exp $"; +static char rcsid[] = "$OpenBSD: pass1b.c,v 1.5 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -69,8 +69,8 @@ pass1b_info(buf, buflen) void pass1b() { - register int c, i; - register struct dinode *dp; + int c, i; + struct dinode *dp; struct inodesc idesc; ino_t inumber; @@ -99,9 +99,9 @@ pass1b() static int pass1bcheck(idesc) - register struct inodesc *idesc; + struct inodesc *idesc; { - register struct dups *dlp; + struct dups *dlp; int nfrags, res = KEEPON; daddr_t blkno = idesc->id_blkno; diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index 0d09da1c17b..e23d518db0d 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass2.c,v 1.10 2001/07/07 18:26:12 deraadt Exp $ */ +/* $OpenBSD: pass2.c,v 1.11 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: pass2.c,v 1.17 1996/09/27 22:45:15 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass2.c 8.6 (Berkeley) 10/27/94"; #else -static char rcsid[] = "$OpenBSD: pass2.c,v 1.10 2001/07/07 18:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pass2.c,v 1.11 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -85,8 +85,8 @@ pass2_info2(buf, buflen) void pass2() { - register struct dinode *dp; - register struct inoinfo **inpp, *inp, *pinp; + struct dinode *dp; + struct inoinfo **inpp, *inp, *pinp; struct inoinfo **inpend; struct inodesc curino; struct dinode dino; @@ -259,8 +259,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/pass3.c b/sbin/fsck_ffs/pass3.c index 0caa1d1fe7d..6bc85f4be26 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass3.c,v 1.5 2001/07/07 18:26:12 deraadt Exp $ */ +/* $OpenBSD: pass3.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: pass3.c,v 1.8 1995/03/18 14:55:54 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass3.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: pass3.c,v 1.5 2001/07/07 18:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pass3.c,v 1.6 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -64,7 +64,7 @@ pass3_info(buf, buflen) void pass3() { - register struct inoinfo **inpp, *inp, *pinp; + struct inoinfo **inpp, *inp, *pinp; ino_t orphan; int loopcnt; diff --git a/sbin/fsck_ffs/pass4.c b/sbin/fsck_ffs/pass4.c index 7111d0ad59b..8d32bb133de 100644 --- a/sbin/fsck_ffs/pass4.c +++ b/sbin/fsck_ffs/pass4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass4.c,v 1.4 1999/03/01 07:45:18 d Exp $ */ +/* $OpenBSD: pass4.c,v 1.5 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: pass4.c,v 1.11 1996/09/27 22:45:17 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass4.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: pass4.c,v 1.4 1999/03/01 07:45:18 d Exp $"; +static char rcsid[] = "$OpenBSD: pass4.c,v 1.5 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -68,8 +68,8 @@ pass4_info(buf, buflen) void pass4() { - register ino_t inumber; - register struct zlncnt *zlnp; + ino_t inumber; + struct zlncnt *zlnp; struct dinode *dp; struct inodesc idesc; int n; @@ -129,9 +129,9 @@ pass4() int pass4check(idesc) - register struct inodesc *idesc; + struct inodesc *idesc; { - register struct dups *dlp; + struct dups *dlp; int nfrags, res = KEEPON; daddr_t blkno = idesc->id_blkno; diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index cc3508038f6..cf91506b28d 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass5.c,v 1.12 2001/07/07 18:26:12 deraadt Exp $ */ +/* $OpenBSD: pass5.c,v 1.13 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: pass5.c,v 1.16 1996/09/27 22:45:18 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass5.c 8.6 (Berkeley) 11/30/94"; #else -static char rcsid[] = "$OpenBSD: pass5.c,v 1.12 2001/07/07 18:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pass5.c,v 1.13 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -73,8 +73,8 @@ pass5() { int c, blk, frags, basesize, sumsize, mapsize, savednrpos=0; int inomapsize, blkmapsize; - register struct fs *fs = &sblock; - register struct cg *cg = &cgrp; + struct fs *fs = &sblock; + struct cg *cg = &cgrp; daddr_t dbase, dmax; daddr_t d; long i, j, k; @@ -82,7 +82,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; statemap[WINO] = USTATE; diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index 13249699b47..a11facb44d7 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setup.c,v 1.13 2001/07/07 18:26:12 deraadt Exp $ */ +/* $OpenBSD: setup.c,v 1.14 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)setup.c 8.5 (Berkeley) 11/23/94"; #else -static char rcsid[] = "$OpenBSD: setup.c,v 1.13 2001/07/07 18:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: setup.c,v 1.14 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -531,11 +531,11 @@ 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; diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c index 78a053d38e6..86d69e65199 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utilities.c,v 1.12 2001/04/13 02:39:05 gluk Exp $ */ +/* $OpenBSD: utilities.c,v 1.13 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: utilities.c,v 1.18 1996/09/27 22:45:20 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)utilities.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: utilities.c,v 1.12 2001/04/13 02:39:05 gluk Exp $"; +static char rcsid[] = "$OpenBSD: utilities.c,v 1.13 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -132,7 +132,7 @@ reply(question) void bufinit() { - register struct bufarea *bp; + struct bufarea *bp; long bufcnt, i; char *bufp; @@ -172,7 +172,7 @@ getdatablk(blkno, size) 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)) @@ -198,7 +198,7 @@ foundit: void getblk(bp, blk, size) - register struct bufarea *bp; + struct bufarea *bp; daddr_t blk; long size; { @@ -217,9 +217,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; @@ -257,7 +257,7 @@ void ckfini(markclean) int markclean; { - register struct bufarea *bp, *nbp; + struct bufarea *bp, *nbp; int cnt = 0; if (fswritefd < 0) { @@ -445,7 +445,7 @@ getpathname(namebuf, curdir, ino) ino_t curdir, ino; { int len; - register char *cp; + char *cp; struct inodesc idesc; static int busy = 0; @@ -542,7 +542,7 @@ voidquit(n) */ int dofix(idesc, msg) - register struct inodesc *idesc; + struct inodesc *idesc; char *msg; { diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index 762ad52c5ea..d163b75e6bb 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsdb.c,v 1.7 1999/08/06 20:41:06 deraadt Exp $ */ +/* $OpenBSD: fsdb.c,v 1.8 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: fsdb.c,v 1.7 1997/01/11 06:50:53 lukem Exp $ */ /*- @@ -203,7 +203,7 @@ helpfn(argc, argv) int argc; char *argv[]; { - register struct cmdtable *cmdtp; + struct cmdtable *cmdtp; printf("Commands are:\n%-10s %5s %5s %s\n", "command", "min argc", "max argc", "what"); @@ -393,7 +393,7 @@ static int scannames(idesc) struct inodesc *idesc; { - register struct direct *dirp = idesc->id_dirp; + struct direct *dirp = idesc->id_dirp; printf("slot %d ino %d reclen %d: %s, `%.*s'\n", slot++, dirp->d_ino, dirp->d_reclen, typename[dirp->d_type], @@ -512,7 +512,7 @@ static int chinumfunc(idesc) struct inodesc *idesc; { - register struct direct *dirp = idesc->id_dirp; + struct direct *dirp = idesc->id_dirp; if (slotcount++ == desired) { dirp->d_ino = idesc->id_parent; @@ -556,7 +556,7 @@ static int chnamefunc(idesc) struct inodesc *idesc; { - register struct direct *dirp = idesc->id_dirp; + struct direct *dirp = idesc->id_dirp; struct direct testdir; if (slotcount++ == desired) { diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 2457394f51e..dec7804124c 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.53 2001/10/30 22:00:15 millert Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.54 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -81,7 +81,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #else -static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.53 2001/10/30 22:00:15 millert Exp $"; +static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.54 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -372,7 +372,7 @@ main(argc, argv) int argc; char *argv[]; { - register const struct afswtch *rafp = NULL; + const struct afswtch *rafp = NULL; int aflag = 0; int ifaliases = 0; int i; @@ -434,7 +434,7 @@ main(argc, argv) if (getinfo(&ifr) < 0) exit(1); while (argc > 0) { - register const struct cmd *p; + const struct cmd *p; for (p = cmds; p->c_name; p++) if (strcmp(*argv, p->c_name) == 0) @@ -626,7 +626,7 @@ printif(ifrm, ifaliases) } if (!namep || !strcmp(namep, ifa->ifa_name)) { - register const struct afswtch *p; + const struct afswtch *p; if (ifa->ifa_addr->sa_family == AF_INET && ifaliases == 0 && noinet == 0) @@ -704,7 +704,7 @@ printif(ifrm, ifaliases) } if (!strncmp(ifreq.ifr_name, ifrp->ifr_name, sizeof(ifrp->ifr_name))) { - register const struct afswtch *p; + const struct afswtch *p; if (ifrp->ifr_addr.sa_family == AF_INET && ifaliases == 0 && noinet == 0) @@ -1353,7 +1353,7 @@ void status(link) int link; { - register const struct afswtch *p = afp; + const struct afswtch *p = afp; struct ifmediareq ifmr; int *media_list, i; @@ -1902,7 +1902,7 @@ in_getaddr(s, which) char *s; int which; { - register struct sockaddr_in *sin = sintab[which]; + struct sockaddr_in *sin = sintab[which]; struct hostent *hp; struct netent *np; @@ -1925,8 +1925,8 @@ in_getprefix(plen, which) char *plen; int which; { - register struct sockaddr_in *sin = sintab[which]; - register u_char *cp; + struct sockaddr_in *sin = sintab[which]; + u_char *cp; int len = strtol(plen, (char **)NULL, 10); if ((len < 0) || (len > 32)) @@ -1951,11 +1951,11 @@ in_getprefix(plen, which) void printb(s, v, bits) char *s; - register char *bits; - register unsigned short v; + char *bits; + unsigned short v; { - register int i, any = 0; - register char c; + int i, any = 0; + char c; if (bits && *bits == 8) printf("%s=%o", s, v); @@ -2031,8 +2031,8 @@ in6_getprefix(plen, which) char *plen; int which; { - register struct sockaddr_in6 *sin = sin6tab[which]; - register u_char *cp; + struct sockaddr_in6 *sin = sin6tab[which]; + u_char *cp; int len = strtol(plen, (char **)NULL, 10); if ((len < 0) || (len > 128)) @@ -2056,8 +2056,8 @@ prefix(val, size) void *val; int size; { - register u_char *name = (u_char *)val; - register int byte, bit, plen = 0; + u_char *name = (u_char *)val; + int byte, bit, plen = 0; for (byte = 0; byte < size; byte++, plen += 8) if (name[byte] != 0xff) @@ -2196,7 +2196,7 @@ iso_getaddr(addr, which) char *addr; int which; { - register struct sockaddr_iso *siso = sisotab[which]; + struct sockaddr_iso *siso = sisotab[which]; struct iso_addr *iso_addr(); siso->siso_addr = *iso_addr(addr); @@ -2229,7 +2229,7 @@ setnsellength(val) void fixnsel(s) - register struct sockaddr_iso *s; + struct sockaddr_iso *s; { if (s->siso_family == 0) return; diff --git a/sbin/init/init.c b/sbin/init/init.c index aa69686b6ad..30a62c17039 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.22 2001/07/09 07:04:45 deraadt Exp $ */ +/* $OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.22 2001/07/09 07:04:45 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $"; #endif #endif /* not lint */ @@ -905,8 +905,8 @@ char ** construct_argv(command) char *command; { - register int argc = 0; - register char **argv = (char **) malloc(((strlen(command) + 1) / 2 + 1) + int argc = 0; + char **argv = (char **) malloc(((strlen(command) + 1) / 2 + 1) * sizeof (char *)); static const char separators[] = " \t"; @@ -922,7 +922,7 @@ construct_argv(command) */ void free_session(sp) - register session_t *sp; + session_t *sp; { free(sp->se_device); if (sp->se_getty) { @@ -943,9 +943,9 @@ session_t * new_session(sprev, session_index, typ) session_t *sprev; int session_index; - register struct ttyent *typ; + struct ttyent *typ; { - register session_t *sp; + session_t *sp; if ((typ->ty_status & TTY_ON) == 0 || typ->ty_name == 0 || @@ -1023,8 +1023,8 @@ state_func_t read_ttys() { int session_index = 0; - register session_t *sp, *snext; - register struct ttyent *typ; + session_t *sp, *snext; + struct ttyent *typ; /* * Destroy any previous session state. @@ -1187,7 +1187,7 @@ collect_child(pid) pid_t pid; #endif { - register session_t *sp, *sprev, *snext; + session_t *sp, *sprev, *snext; if (! sessions) return; @@ -1256,7 +1256,7 @@ state_func_t multi_user() { pid_t pid; - register session_t *sp; + session_t *sp; requested_transition = 0; @@ -1295,10 +1295,10 @@ multi_user() state_func_t clean_ttys() { - register session_t *sp, *sprev; - register struct ttyent *typ; - register int session_index = 0; - register int devlen; + session_t *sp, *sprev; + struct ttyent *typ; + int session_index = 0; + int devlen; for (sp = sessions; sp; sp = sp->se_next) sp->se_flags &= ~SE_PRESENT; @@ -1355,7 +1355,7 @@ clean_ttys() state_func_t catatonia() { - register session_t *sp; + session_t *sp; for (sp = sessions; sp; sp = sp->se_next) sp->se_flags |= SE_SHUTDOWN; @@ -1379,8 +1379,8 @@ alrm_handler(sig) state_func_t nice_death() { - register session_t *sp; - register int i; + session_t *sp; + int i; pid_t pid; static const int death_sigs[3] = { SIGHUP, SIGTERM, SIGKILL }; int howto = RB_HALT; @@ -1457,8 +1457,8 @@ die: state_func_t death() { - register session_t *sp; - register int i; + session_t *sp; + int i; pid_t pid; static const int death_sigs[3] = { SIGHUP, SIGTERM, SIGKILL }; diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index 6dfc7139121..f59868d24a3 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_nfs.c,v 1.24 2001/10/03 18:50:07 hin Exp $ */ +/* $OpenBSD: mount_nfs.c,v 1.25 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $ */ /* @@ -182,8 +182,8 @@ main(argc, argv) int argc; char *argv[]; { - register int c; - register struct nfs_args *nfsargsp; + int c; + struct nfs_args *nfsargsp; struct nfs_args nfsargs; struct nfsd_cargs ncd; int mntflags, altflags, i, nfssvc_flag, num; @@ -393,7 +393,7 @@ getnfsargs(spec, nfsargsp) char *spec; struct nfs_args *nfsargsp; { - register CLIENT *clp; + CLIENT *clp; struct hostent *hp; static struct sockaddr_in saddr; #ifdef ISO @@ -583,9 +583,9 @@ xdr_dir(xdrsp, dirp) int xdr_fh(xdrsp, np) XDR *xdrsp; - register struct nfhret *np; + struct nfhret *np; { - register int i; + int i; long auth, authcnt, authfnd = 0; if (!xdr_u_long(xdrsp, &np->stat)) diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index a426003c7df..ef90fcbd72b 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mountd.c,v 1.38 2001/10/03 18:54:29 hin Exp $ */ +/* $OpenBSD: mountd.c,v 1.39 2001/11/05 07:39:16 mpech Exp $ */ /* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */ /* @@ -535,7 +535,7 @@ xdr_fhs(xdrsp, cp) XDR *xdrsp; caddr_t cp; { - register struct fhreturn *fhrp = (struct fhreturn *)cp; + struct fhreturn *fhrp = (struct fhreturn *)cp; long ok = 0, len, auth; if (!xdr_long(xdrsp, &ok)) diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c index 3ce9159f02a..ff518221ba1 100644 --- a/sbin/ncheck_ffs/ncheck_ffs.c +++ b/sbin/ncheck_ffs/ncheck_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncheck_ffs.c,v 1.6 2001/07/07 18:26:16 deraadt Exp $ */ +/* $OpenBSD: ncheck_ffs.c,v 1.7 2001/11/05 07:39:16 mpech Exp $ */ /*- * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -31,7 +31,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.6 2001/07/07 18:26:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.7 2001/11/05 07:39:16 mpech Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -158,8 +158,8 @@ void findinodes(maxino) ino_t maxino; { - register ino_t ino; - register struct dinode *dp; + ino_t ino; + struct dinode *dp; mode_t mode; for (ino = ROOTINO; ino < maxino; ino++) { diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 318495ab7cf..0e21f95c6de 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkfs.c,v 1.19 2001/07/07 18:26:16 deraadt Exp $ */ +/* $OpenBSD: mkfs.c,v 1.20 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)mkfs.c 8.3 (Berkeley) 2/3/94"; #else -static char rcsid[] = "$OpenBSD: mkfs.c,v 1.19 2001/07/07 18:26:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mkfs.c,v 1.20 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -150,7 +150,7 @@ mkfs(pp, fsys, fi, fo) char *fsys; int fi, fo; { - register long i, mincpc, mincpg, inospercg; + long i, mincpc, mincpg, inospercg; long cylno, rpos, blk, j, warn = 0; long used, mincpgcnt, bpcg; long mapcramped, inodecramped; @@ -726,7 +726,7 @@ initcg(cylno, utime) { daddr_t cbase, d, dlower, dupper, dmax, blkno; long i, j; - register struct csum *cs; + struct csum *cs; /* * Determine block bounds for cylinder group. @@ -1054,8 +1054,8 @@ goth: */ void iput(ip, ino) - register struct dinode *ip; - register ino_t ino; + struct dinode *ip; + ino_t ino; { struct dinode *buf = (struct dinode *)malloc(MAXINOPB * sizeof (struct dinode)); diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index d60cea5f77e..0698875c461 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.28 2001/07/07 18:26:16 deraadt Exp $ */ +/* $OpenBSD: newfs.c,v 1.29 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.28 2001/07/07 18:26:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.29 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -198,9 +198,9 @@ main(argc, argv) int argc; char *argv[]; { - register int ch; - register struct partition *pp; - register struct disklabel *lp; + int ch; + struct partition *pp; + struct disklabel *lp; struct disklabel mfsfakelabel; struct disklabel *getdisklabel(); struct partition oldpartition; @@ -645,7 +645,7 @@ void rewritelabel(s, fd, lp) char *s; int fd; - register struct disklabel *lp; + struct disklabel *lp; { #ifdef COMPAT if (unlabeled) @@ -659,7 +659,7 @@ rewritelabel(s, fd, lp) } #ifdef __vax__ if (lp->d_type == DTYPE_SMD && lp->d_flags & D_BADSECT) { - register i; + int i; int cfd; daddr_t alt; char specname[64]; diff --git a/sbin/newlfs/lfs.c b/sbin/newlfs/lfs.c index caf3eedb47e..7220287491c 100644 --- a/sbin/newlfs/lfs.c +++ b/sbin/newlfs/lfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs.c,v 1.3 1996/07/01 11:02:54 downsj Exp $ */ +/* $OpenBSD: lfs.c,v 1.4 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: lfs.c,v 1.8 1995/06/19 21:30:36 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95"; #else -static char rcsid[] = "$OpenBSD: lfs.c,v 1.3 1996/07/01 11:02:54 downsj Exp $"; +static char rcsid[] = "$OpenBSD: lfs.c,v 1.4 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -671,7 +671,7 @@ make_dinode(ino, dip, nblocks, saddr, lfsp) static void make_dir(bufp, protodir, entries) void *bufp; - register struct direct *protodir; + struct direct *protodir; int entries; { char *cp; diff --git a/sbin/newlfs/misc.c b/sbin/newlfs/misc.c index 3fe32ac9031..1baff52135e 100644 --- a/sbin/newlfs/misc.c +++ b/sbin/newlfs/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.3 1997/07/25 19:13:09 mickey Exp $ */ +/* $OpenBSD: misc.c,v 1.4 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: misc.c,v 1.2 1995/03/18 14:58:51 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.3 1997/07/25 19:13:09 mickey Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -53,7 +53,7 @@ u_int log2(num) u_int num; { - register u_int i, limit; + u_int i, limit; limit = 1; for (i = 0; limit < num; limit = limit << 1, i++); diff --git a/sbin/pdisk/io.c b/sbin/pdisk/io.c index 47800bd314a..bec60465782 100644 --- a/sbin/pdisk/io.c +++ b/sbin/pdisk/io.c @@ -240,7 +240,7 @@ get_number_argument(char *prompt, long *number, long default_value) long get_number(int first_char) { - register int c; + int c; int base; int digit; int ret_value; diff --git a/sbin/pdisk/layout_dump.c b/sbin/pdisk/layout_dump.c index 9868d844b5b..5f5140ef56b 100644 --- a/sbin/pdisk/layout_dump.c +++ b/sbin/pdisk/layout_dump.c @@ -151,7 +151,7 @@ dump_using_layout(void *buffer, layout *desc) void DumpRawBuffer(unsigned char *bufferPtr, int length ) { - register int i; + int i; int lineStart; int lineLength; short c; diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 76439e51ae1..f6cb8d7a128 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.46 2001/10/04 07:37:24 jakob Exp $ */ +/* $OpenBSD: ping.c,v 1.47 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: ping.c,v 1.46 2001/10/04 07:37:24 jakob Exp $"; +static char rcsid[] = "$OpenBSD: ping.c,v 1.47 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -195,7 +195,7 @@ main(argc, argv) struct sockaddr_in *to; struct protoent *proto; struct in_addr saddr; - register int i; + int i; int ch, hold = 1, packlen, preload; int maxsize, maxsizelen, fdmasks; u_char *datap, *packet; @@ -496,7 +496,7 @@ main(argc, argv) for (;;) { struct sockaddr_in from; - register int cc; + int cc; int fromlen; sigset_t omask, nmask; @@ -589,8 +589,8 @@ prtsig() void pinger() { - register struct icmp *icp; - register int cc; + struct icmp *icp; + int cc; int i; char *packet = outpack; @@ -653,10 +653,10 @@ pr_pack(buf, cc, from) int cc; struct sockaddr_in *from; { - register struct icmp *icp; - register in_addr_t l; - register u_int i, j; - register u_char *cp, *dp; + struct icmp *icp; + in_addr_t l; + u_int i, j; + u_char *cp, *dp; static int old_rrlen; static char old_rr[MAX_IPOPTLEN]; struct ip *ip, *ip2; @@ -873,9 +873,9 @@ in_cksum(addr, len) u_short *addr; int len; { - register int nleft = len; - register u_short *w = addr; - register int sum = 0; + int nleft = len; + u_short *w = addr; + int sum = 0; u_short answer = 0; /* @@ -1259,7 +1259,7 @@ void fill(bp, patp) char *bp, *patp; { - register int ii, jj, kk; + int ii, jj, kk; int pat[16]; char *cp; diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index 668a7b6ad17..5e17e285216 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -1,4 +1,4 @@ -/* $OpenBSD: quotacheck.c,v 1.10 1997/06/25 18:29:07 kstailey Exp $ */ +/* $OpenBSD: quotacheck.c,v 1.11 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: quotacheck.c,v 1.12 1996/03/30 22:34:25 mark Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)quotacheck.c 8.3 (Berkeley) 1/29/94"; #else -static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.10 1997/06/25 18:29:07 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.11 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -135,9 +135,9 @@ main(argc, argv) int argc; char *argv[]; { - register struct fstab *fs; - register struct passwd *pw; - register struct group *gr; + struct fstab *fs; + struct passwd *pw; + struct group *gr; struct quotaname *auxdata; int i, argnum, maxrun, errs; long done = 0; @@ -223,9 +223,9 @@ usage() void * needchk(fs) - register struct fstab *fs; + struct fstab *fs; { - register struct quotaname *qnp; + struct quotaname *qnp; char *qfnp; if (fs->fs_passno == 0) @@ -264,9 +264,9 @@ chkquota(vfstype, fsname, mntpt, auxarg, pidp) void *auxarg; pid_t *pidp; { - register struct quotaname *qnp = auxarg; - register struct fileusage *fup; - register struct dinode *dp; + struct quotaname *qnp = auxarg; + struct fileusage *fup; + struct dinode *dp; int cg, i, mode, errs = 0, status; ino_t ino; pid_t pid; @@ -359,11 +359,11 @@ chkquota(vfstype, fsname, mntpt, auxarg, pidp) int update(fsname, quotafile, type) const char *fsname, *quotafile; - register int type; + int type; { - register struct fileusage *fup; - register FILE *qfi, *qfo; - register u_long id, lastid; + struct fileusage *fup; + FILE *qfi, *qfo; + u_long id, lastid; struct dqblk dqbuf; static int warned = 0; static struct dqblk zerodqbuf; @@ -457,10 +457,10 @@ update(fsname, quotafile, type) */ int oneof(target, list, cnt) - register char *target, *list[]; + char *target, *list[]; int cnt; { - register int i; + int i; for (i = 0; i < cnt; i++) if (strcmp(target, list[i]) == 0) @@ -486,11 +486,11 @@ getquotagid() */ int hasquota(fs, type, qfnamep) - register struct fstab *fs; + struct fstab *fs; int type; char **qfnamep; { - register char *opt; + char *opt; char *cp; static char initname, usrname[100], grpname[100]; static char buf[BUFSIZ]; @@ -533,7 +533,7 @@ lookup(id, type) u_long id; int type; { - register struct fileusage *fup; + struct fileusage *fup; for (fup = fuhead[type][id & (FUHASH-1)]; fup != 0; fup = fup->fu_next) if (fup->fu_id == id) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 3e6de8c0146..841eaebcabf 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reboot.c,v 1.21 2001/07/19 17:41:22 millert Exp $ */ +/* $OpenBSD: reboot.c,v 1.22 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: reboot.c,v 1.8 1995/10/05 05:36:22 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: reboot.c,v 1.21 2001/07/19 17:41:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: reboot.c,v 1.22 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -76,7 +76,7 @@ main(argc, argv) int argc; char *argv[]; { - register int i; + int i; struct passwd *pw; int ch, howto, dohalt, lflag, nflag, pflag, qflag, sverrno; char *p, *user; diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c index b460d0745b1..1f9223afd3e 100644 --- a/sbin/restore/dirs.c +++ b/sbin/restore/dirs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dirs.c,v 1.17 1999/08/17 09:13:15 millert Exp $ */ +/* $OpenBSD: dirs.c,v 1.18 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: dirs.c,v 1.26 1997/07/01 05:37:49 lukem Exp $ */ /* @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)dirs.c 8.5 (Berkeley) 8/31/94"; #else -static char rcsid[] = "$OpenBSD: dirs.c,v 1.17 1999/08/17 09:13:15 millert Exp $"; +static char rcsid[] = "$OpenBSD: dirs.c,v 1.18 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -146,8 +146,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; @@ -233,8 +233,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]; @@ -324,8 +324,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); @@ -350,9 +350,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) { @@ -446,8 +446,8 @@ flushent() static void dcvt(odp, ndp) - register struct odirect *odp; - register struct direct *ndp; + struct odirect *odp; + struct direct *ndp; { memset(ndp, 0, (size_t)(sizeof *ndp)); @@ -467,7 +467,7 @@ dcvt(odp, ndp) */ static void rst_seekdir(dirp, loc, base) - register RST_DIR *dirp; + RST_DIR *dirp; long loc, base; { @@ -487,9 +487,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) { @@ -574,8 +574,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); @@ -657,7 +657,7 @@ genliteraldir(name, ino) char *name; ino_t ino; { - register struct inotab *itp; + struct inotab *itp; int ofile, dp, i, size; char buf[BUFSIZ]; @@ -714,7 +714,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)); @@ -746,7 +746,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 a3a86d993f4..3a7d101157b 100644 --- a/sbin/restore/interactive.c +++ b/sbin/restore/interactive.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interactive.c,v 1.12 2001/07/07 18:26:19 deraadt Exp $ */ +/* $OpenBSD: interactive.c,v 1.13 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: interactive.c,v 1.10 1997/03/19 08:42:52 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)interactive.c 8.3 (Berkeley) 9/13/94"; #else -static char rcsid[] = "$OpenBSD: interactive.c,v 1.12 2001/07/07 18:26:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: interactive.c,v 1.13 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -102,7 +102,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]; @@ -312,7 +312,7 @@ getcmd(curdir, cmd, name, ap) char *curdir, *cmd, *name; struct arglist *ap; { - register char *cp; + char *cp; static char input[BUFSIZ]; char output[BUFSIZ]; # define rawname input /* save space by reusing input buffer */ @@ -416,7 +416,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++) @@ -466,7 +466,7 @@ void canon(rawname, canonname) char *rawname, *canonname; { - register char *cp, *np; + char *cp, *np; if (strcmp(rawname, ".") == 0 || strncmp(rawname, "./", 2) == 0) (void)strcpy(canonname, ""); @@ -517,8 +517,8 @@ printlist(name, basename) char *name; char *basename; { - register struct afile *fp, *list, *listp = NULL; - register struct direct *dp; + struct afile *fp, *list, *listp = NULL; + struct direct *dp; struct afile single; RST_DIR *dirp; int entries, len, namelen; @@ -600,7 +600,7 @@ static void mkentry(name, dp, fp) char *name; struct direct *dp; - register struct afile *fp; + struct afile *fp; { char *cp; struct entry *np; @@ -661,10 +661,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 = 0, columns, lines; @@ -761,7 +761,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) || @@ -779,7 +779,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 d3cc9a94963..6087f286de5 100644 --- a/sbin/restore/restore.c +++ b/sbin/restore/restore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: restore.c,v 1.5 1997/07/05 23:10:21 deraadt Exp $ */ +/* $OpenBSD: restore.c,v 1.6 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: restore.c,v 1.9 1997/06/18 07:10:16 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)restore.c 8.3 (Berkeley) 9/13/94"; #else -static char rcsid[] = "$OpenBSD: restore.c,v 1.5 1997/07/05 23:10:21 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: restore.c,v 1.6 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -84,7 +84,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]; @@ -166,8 +166,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))) { @@ -222,7 +222,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; @@ -531,8 +531,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++) { @@ -579,7 +579,7 @@ findunreflinks() void removeoldnodes() { - register struct entry *ep, **prev; + struct entry *ep, **prev; long change; Vprintf(stdout, "Remove old nodes (directories).\n"); @@ -609,7 +609,7 @@ void createleaves(symtabfile) char *symtabfile; { - register struct entry *ep; + struct entry *ep; ino_t first; long curvol; @@ -688,8 +688,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"); @@ -776,8 +776,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))) { @@ -816,8 +816,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 2d56cd5e7fa..9c8427afb14 100644 --- a/sbin/restore/symtab.c +++ b/sbin/restore/symtab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: symtab.c,v 1.5 1997/07/05 20:51:25 millert Exp $ */ +/* $OpenBSD: symtab.c,v 1.6 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: symtab.c,v 1.10 1997/03/19 08:42:54 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)symtab.c 8.2 (Berkeley) 9/13/94"; #else -static char rcsid[] = "$OpenBSD: symtab.c,v 1.5 1997/07/05 20:51:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: symtab.c,v 1.6 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -88,7 +88,7 @@ struct entry * lookupino(inum) ino_t inum; { - register struct entry *ep; + struct entry *ep; if (inum < WINO || inum >= maxino) return (NULL); @@ -127,7 +127,7 @@ void deleteino(inum) ino_t inum; { - register struct entry *next; + struct entry *next; struct entry **prev; if (inum < WINO || inum >= maxino) @@ -151,8 +151,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; @@ -202,9 +202,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]; ) { @@ -234,7 +234,7 @@ addentry(name, inum, type) ino_t inum; int type; { - register struct entry *np, *ep; + struct entry *np, *ep; if (freelist != NULL) { np = freelist; @@ -281,9 +281,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) @@ -325,7 +325,7 @@ freeentry(ep) */ void moveentry(ep, newname) - register struct entry *ep; + struct entry *ep; char *newname; { struct entry *np; @@ -355,9 +355,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) { @@ -460,8 +460,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; @@ -548,11 +548,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 b77930aedc1..10256e459cc 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.18 2001/07/07 18:26:20 deraadt Exp $ */ +/* $OpenBSD: tape.c,v 1.19 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: tape.c,v 1.26 1997/04/15 07:12:25 lukem Exp $ */ /* @@ -645,7 +645,7 @@ getfile(fill, skip) void (*fill) __P((char *, long)); void (*skip) __P((char *, long)); { - register int i; + int i; volatile int curblk = 0; volatile long size = spcl.c_dinode.di_size; static char clearedbuf[MAXBSIZE]; @@ -923,7 +923,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; @@ -1242,9 +1242,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; @@ -1297,8 +1297,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; @@ -1311,8 +1311,8 @@ swabshort(sp, n) static u_char * swablong(sp, n) - register u_char *sp; - register int n; + u_char *sp; + int n; { char c; @@ -1326,7 +1326,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 33e19a8341b..d042110a150 100644 --- a/sbin/restore/utilities.c +++ b/sbin/restore/utilities.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utilities.c,v 1.6 2001/09/05 22:32:37 deraadt Exp $ */ +/* $OpenBSD: utilities.c,v 1.7 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: utilities.c,v 1.11 1997/03/19 08:42:56 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)utilities.c 8.4 (Berkeley) 10/18/94"; #else -static char rcsid[] = "$OpenBSD: utilities.c,v 1.6 2001/09/05 22:32:37 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: utilities.c,v 1.7 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -64,7 +64,7 @@ void pathcheck(name) char *name; { - register char *cp; + char *cp; struct entry *ep; char *start; @@ -91,7 +91,7 @@ pathcheck(name) */ void mktempname(ep) - register struct entry *ep; + struct entry *ep; { char oldname[MAXPATHLEN]; @@ -164,7 +164,7 @@ newnode(np) */ void removenode(ep) - register struct entry *ep; + struct entry *ep; { char *cp; @@ -187,7 +187,7 @@ removenode(ep) */ void removeleaf(ep) - register struct entry *ep; + struct entry *ep; { char *cp; @@ -254,7 +254,7 @@ addwhiteout(name) */ void delwhiteout(ep) - register struct entry *ep; + struct entry *ep; { char *name; @@ -277,7 +277,7 @@ ino_t lowerbnd(start) ino_t start; { - register struct entry *ep; + struct entry *ep; for ( ; start < maxino; start++) { ep = lookupino(start); @@ -296,7 +296,7 @@ ino_t upperbnd(start) ino_t start; { - register struct entry *ep; + struct entry *ep; for ( ; start > ROOTINO; start--) { ep = lookupino(start); @@ -313,7 +313,7 @@ upperbnd(start) */ void badentry(ep, msg) - register struct entry *ep; + struct entry *ep; char *msg; { @@ -340,7 +340,7 @@ badentry(ep, msg) */ char * flagvalues(ep) - register struct entry *ep; + struct entry *ep; { static char flagbuf[BUFSIZ]; diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index cda28767e2d..58ffca3daa2 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: savecore.c,v 1.26 2001/07/07 18:26:21 deraadt Exp $ */ +/* $OpenBSD: savecore.c,v 1.27 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: savecore.c,v 1.26 1996/03/18 21:16:05 leo Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)savecore.c 8.3 (Berkeley) 1/2/94"; #else -static char rcsid[] = "$OpenBSD: savecore.c,v 1.26 2001/07/07 18:26:21 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: savecore.c,v 1.27 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -307,8 +307,8 @@ kmem_setup() void check_kmem() { - register char *cp; - register int panicloc; + char *cp; + int panicloc; char core_vers[1024]; if (kvm_read(kd_dump, dump_nl[X_VERSION].n_value, core_vers, @@ -394,8 +394,8 @@ char buf[1024 * 1024]; void save_core() { - register FILE *fp; - register int bounds, ifd, nr, nw, ofd = -1; + FILE *fp; + int bounds, ifd, nr, nw, ofd = -1; char *rawp, path[MAXPATHLEN]; mode_t um; @@ -526,10 +526,10 @@ err2: syslog(LOG_WARNING, char * find_dev(dev, type) - register dev_t dev; - register int type; + dev_t dev; + int type; { - register DIR *dfd; + DIR *dfd; struct dirent *dir; struct stat sb; char *dp, devname[MAXPATHLEN + 1]; @@ -603,7 +603,7 @@ get_crashtime() int check_space() { - register FILE *fp; + FILE *fp; char *tkernel; off_t minfree, spacefree, kernelsize, needed; struct stat st; @@ -678,7 +678,7 @@ Create(file, mode) char *file; int mode; { - register int fd; + int fd; fd = open(file, O_WRONLY | O_CREAT | O_TRUNC, mode); if (fd < 0) { diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index 7e5f93e8227..f128feb6ffb 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shutdown.c,v 1.22 2001/07/09 07:04:47 deraadt Exp $ */ +/* $OpenBSD: shutdown.c,v 1.23 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: shutdown.c,v 1.9 1995/03/18 15:01:09 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94"; #else -static char rcsid[] = "$OpenBSD: shutdown.c,v 1.22 2001/07/09 07:04:47 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: shutdown.c,v 1.23 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -122,7 +122,7 @@ main(argc, argv) int argc; char *argv[]; { - register char *p, *endp; + char *p, *endp; struct passwd *pw; int arglen, ch, len, readstdin; @@ -439,10 +439,10 @@ die_you_gravy_sucking_pig_dog() void getoffset(timearg) - register char *timearg; + char *timearg; { - register struct tm *lt; - register char *p; + struct tm *lt; + char *p; time_t now; int this_year; diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c index 4f50969b5f1..3b40a236fa1 100644 --- a/sbin/slattach/slattach.c +++ b/sbin/slattach/slattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slattach.c,v 1.9 2001/06/01 21:35:20 mickey Exp $ */ +/* $OpenBSD: slattach.c,v 1.10 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: slattach.c,v 1.17 1996/05/19 21:57:39 jonathan Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)slattach.c 8.2 (Berkeley) 1/7/94"; #else -static char rcsid[] = "$OpenBSD: slattach.c,v 1.9 2001/06/01 21:35:20 mickey Exp $"; +static char rcsid[] = "$OpenBSD: slattach.c,v 1.10 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -94,8 +94,8 @@ main(argc, argv) int argc; char *argv[]; { - register int fd; - register char *dev; + int fd; + char *dev; struct termios tty; tcflag_t cflag = HUPCL; int ch; diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index 9ccd3df50f3..952dc6e0b01 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tunefs.c,v 1.14 2001/10/05 14:35:42 jakob Exp $ */ +/* $OpenBSD: tunefs.c,v 1.15 2001/11/05 07:39:17 mpech Exp $ */ /* $NetBSD: tunefs.c,v 1.10 1995/03/18 15:01:31 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94"; #else -static char rcsid[] = "$OpenBSD: tunefs.c,v 1.14 2001/10/05 14:35:42 jakob Exp $"; +static char rcsid[] = "$OpenBSD: tunefs.c,v 1.15 2001/11/05 07:39:17 mpech Exp $"; #endif #endif /* not lint */ @@ -289,7 +289,7 @@ usage() void getsb(fs, file) - register struct fs *fs; + struct fs *fs; char *file; { |