diff options
author | obrien <obrien@FreeBSD.org> | 2002-03-21 23:39:28 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2002-03-21 23:39:28 +0000 |
commit | 084b4588f24346b3d369eaf49193461c380e8521 (patch) | |
tree | 1cbfa8bb28a9bf0d0b93ca61ac5323ef95e4c7f7 /lib/libcompat | |
parent | 454845084c112df969ca14adced4fd6c1d7305b6 (diff) | |
download | FreeBSD-src-084b4588f24346b3d369eaf49193461c380e8521.zip FreeBSD-src-084b4588f24346b3d369eaf49193461c380e8521.tar.gz |
Remove 'register' keyword.
Diffstat (limited to 'lib/libcompat')
-rw-r--r-- | lib/libcompat/4.3/insque.c | 4 | ||||
-rw-r--r-- | lib/libcompat/4.3/lsearch.c | 4 | ||||
-rw-r--r-- | lib/libcompat/4.3/remque.c | 4 | ||||
-rw-r--r-- | lib/libcompat/4.4/cuserid.c | 4 | ||||
-rw-r--r-- | lib/libcompat/regexp/regexp.c | 116 | ||||
-rw-r--r-- | lib/libcompat/regexp/regsub.c | 14 |
6 files changed, 81 insertions, 65 deletions
diff --git a/lib/libcompat/4.3/insque.c b/lib/libcompat/4.3/insque.c index 3035976..d290860 100644 --- a/lib/libcompat/4.3/insque.c +++ b/lib/libcompat/4.3/insque.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)insque.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * insque -- vax insque instruction @@ -48,7 +50,7 @@ struct vaxque { /* queue format expected by VAX queue instructions */ void insque(e, prev) - register struct vaxque *e, *prev; + struct vaxque *e, *prev; { e->vq_prev = prev; e->vq_next = prev->vq_next; diff --git a/lib/libcompat/4.3/lsearch.c b/lib/libcompat/4.3/lsearch.c index be650b4..3d46715 100644 --- a/lib/libcompat/4.3/lsearch.c +++ b/lib/libcompat/4.3/lsearch.c @@ -37,6 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <unistd.h> @@ -68,7 +70,7 @@ linear_base(key, base, nelp, width, compar, add_flag) u_int *nelp, width; int (*compar)(), add_flag; { - register char *element, *end; + char *element, *end; end = base + *nelp * width; for (element = base; element < end; element += width) diff --git a/lib/libcompat/4.3/remque.c b/lib/libcompat/4.3/remque.c index e0f9aa3..b57046c 100644 --- a/lib/libcompat/4.3/remque.c +++ b/lib/libcompat/4.3/remque.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)remque.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); /* * remque -- vax remque instruction @@ -48,7 +50,7 @@ struct vaxque { /* queue format expected by VAX queue instructions */ void remque(e) - register struct vaxque *e; + struct vaxque *e; { e->vq_prev->vq_next = e->vq_next; e->vq_next->vq_prev = e->vq_prev; diff --git a/lib/libcompat/4.4/cuserid.c b/lib/libcompat/4.4/cuserid.c index 2fc5cc8..e2f0988f 100644 --- a/lib/libcompat/4.4/cuserid.c +++ b/lib/libcompat/4.4/cuserid.c @@ -34,6 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)cuserid.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <pwd.h> #include <stdio.h> @@ -44,7 +46,7 @@ char * cuserid(s) char *s; { - register struct passwd *pwd; + struct passwd *pwd; if ((pwd = getpwuid(geteuid())) == NULL) { if (s) diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c index fc97378..8276ffc 100644 --- a/lib/libcompat/regexp/regexp.c +++ b/lib/libcompat/regexp/regexp.c @@ -32,6 +32,10 @@ * precedence is structured in regular expressions. Serious changes in * regular-expression syntax might require a total rethink. */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <limits.h> #include <regexp.h> #include <stdio.h> @@ -205,10 +209,10 @@ regexp * regcomp(exp) const char *exp; { - register regexp *r; - register char *scan; - register char *longest; - register int len; + regexp *r; + char *scan; + char *longest; + int len; int flags; if (exp == NULL) @@ -296,10 +300,10 @@ reg(paren, flagp) int paren; /* Parenthesized? */ int *flagp; { - register char *ret; - register char *br; - register char *ender; - register int parno; + char *ret; + char *br; + char *ender; + int parno; int flags; *flagp = HASWIDTH; /* Tentatively. */ @@ -367,9 +371,9 @@ static char * regbranch(flagp) int *flagp; { - register char *ret; - register char *chain; - register char *latest; + char *ret; + char *chain; + char *latest; int flags; *flagp = WORST; /* Tentatively. */ @@ -407,9 +411,9 @@ static char * regpiece(flagp) int *flagp; { - register char *ret; - register char op; - register char *next; + char *ret; + char op; + char *next; int flags; ret = regatom(&flags); @@ -471,7 +475,7 @@ static char * regatom(flagp) int *flagp; { - register char *ret; + char *ret; int flags; *flagp = WORST; /* Tentatively. */ @@ -489,8 +493,8 @@ int *flagp; *flagp |= HASWIDTH|SIMPLE; break; case '[': { - register int class; - register int classend; + int class; + int classend; int i; if (*regparse == '^') { /* Complement of range. */ @@ -597,7 +601,7 @@ int *flagp; */ { char *regprev; - register char ch; + char ch; regparse--; /* Look at cur char */ ret = regnode(EXACTLY); @@ -661,8 +665,8 @@ static char * /* Location. */ regnode(op) char op; { - register char *ret; - register char *ptr; + char *ret; + char *ptr; ret = regcode; if (ret == ®dummy) { @@ -702,9 +706,9 @@ reginsert(op, opnd) char op; char *opnd; { - register char *src; - register char *dst; - register char *place; + char *src; + char *dst; + char *place; if (regcode == ®dummy) { regsize += 3; @@ -731,9 +735,9 @@ regtail(p, val) char *p; char *val; { - register char *scan; - register char *temp; - register int offset; + char *scan; + char *temp; + int offset; if (p == ®dummy) return; @@ -799,10 +803,10 @@ STATIC char *regprop(); */ int regexec(prog, string) -register const regexp *prog; -register const char *string; +const regexp *prog; +const char *string; { - register char *s; + char *s; extern char *strchr(); /* Be paranoid... */ @@ -864,9 +868,9 @@ regtry(prog, string) regexp *prog; char *string; { - register int i; - register char **sp; - register char **ep; + int i; + char **sp; + char **ep; reginput = string; regstartp = prog->startp; @@ -900,7 +904,7 @@ static int /* 0 failure, 1 success */ regmatch(prog) char *prog; { - register char *scan; /* Current node. */ + char *scan; /* Current node. */ char *next; /* Next node. */ scan = prog; @@ -945,8 +949,8 @@ char *prog; reginput++; break; case EXACTLY: { - register int len; - register char *opnd; + int len; + char *opnd; opnd = OPERAND(scan); /* Inline the first character, for speed. */ @@ -981,8 +985,8 @@ char *prog; case OPEN+7: case OPEN+8: case OPEN+9: { - register int no; - register char *save; + int no; + char *save; no = OP(scan) - OPEN; save = reginput; @@ -1009,8 +1013,8 @@ char *prog; case CLOSE+7: case CLOSE+8: case CLOSE+9: { - register int no; - register char *save; + int no; + char *save; no = OP(scan) - CLOSE; save = reginput; @@ -1029,7 +1033,7 @@ char *prog; } break; case BRANCH: { - register char *save; + char *save; if (OP(next) != BRANCH) /* No choice. */ next = OPERAND(scan); /* Avoid recursion. */ @@ -1048,10 +1052,10 @@ char *prog; break; case STAR: case PLUS: { - register char nextch; - register int no; - register char *save; - register int min; + char nextch; + int no; + char *save; + int min; /* * Lookahead to avoid useless match attempts @@ -1102,9 +1106,9 @@ static int regrepeat(p) char *p; { - register int count = 0; - register char *scan; - register char *opnd; + int count = 0; + char *scan; + char *opnd; scan = reginput; opnd = OPERAND(p); @@ -1146,9 +1150,9 @@ char *p; */ static char * regnext(p) -register char *p; +char *p; { - register int offset; + int offset; if (p == ®dummy) return(NULL); @@ -1174,9 +1178,9 @@ void regdump(r) regexp *r; { - register char *s; - register char op = EXACTLY; /* Arbitrary non-END op. */ - register char *next; + char *s; + char op = EXACTLY; /* Arbitrary non-END op. */ + char *next; extern char *strchr(); @@ -1218,7 +1222,7 @@ static char * regprop(op) char *op; { - register char *p; + char *p; static char buf[50]; (void) strcpy(buf, ":"); @@ -1317,9 +1321,9 @@ strcspn(s1, s2) char *s1; char *s2; { - register char *scan1; - register char *scan2; - register int count; + char *scan1; + char *scan2; + int count; count = 0; for (scan1 = s1; *scan1 != '\0'; scan1++) { diff --git a/lib/libcompat/regexp/regsub.c b/lib/libcompat/regexp/regsub.c index e55b9b6..4ab921c 100644 --- a/lib/libcompat/regexp/regsub.c +++ b/lib/libcompat/regexp/regsub.c @@ -18,6 +18,10 @@ * 3. Altered versions must be plainly marked as such, and must not * be misrepresented as being the original software. */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <regexp.h> #include <stdio.h> #include <string.h> @@ -38,11 +42,11 @@ const regexp *prog; const char *source; char *dest; { - register char *src; - register char *dst; - register char c; - register int no; - register int len; + char *src; + char *dst; + char c; + int no; + int len; extern char *strncpy(); if (prog == NULL || source == NULL || dest == NULL) { |