dtdocbook: remove register keyword

cde/programs/dtdocbook/lib/tptregexp/regexp.c

@@ -214,10 +214,10 @@ STATIC int strcspn();
 regexp *
 tpt_regcomp(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)
@@ -303,10 +303,10 @@ 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. */
@@ -373,9 +373,9 @@ int *flagp
 static char *
 regbranch(int *flagp)
 {
-	register char *ret;
-	register char *chain;
-	register char *latest;
+	char *ret;
+	char *chain;
+	char *latest;
 	int flags;
 
 	*flagp = WORST;		/* Tentatively. */
@@ -411,9 +411,9 @@ regbranch(int *flagp)
 static char *
 regpiece(int *flagp)
 {
-	register char *ret;
-	register char op;
-	register char *next;
+	char *ret;
+	char op;
+	char *next;
 	int flags;
 
 	ret = regatom(&flags);
@@ -474,7 +474,7 @@ regpiece(int *flagp)
 static char *
 regatom(int *flagp)
 {
-	register char *ret;
+	char *ret;
 	int flags;
 
 	*flagp = WORST;		/* Tentatively. */
@@ -491,8 +491,8 @@ regatom(int *flagp)
 		*flagp |= HASWIDTH|SIMPLE;
 		break;
 	case '[': {
-			register int class;
-			register int classend;
+			int class;
+			int classend;
 
 			if (*regparse == '^') {	/* Complement of range. */
 				ret = regnode(ANYBUT);
@@ -550,8 +550,8 @@ regatom(int *flagp)
 		*flagp |= HASWIDTH|SIMPLE;
 		break;
 	default: {
-			register int len;
-			register char ender;
+			int len;
+			char ender;
 
 			regparse--;
 			len = strcspn(regparse, META);
@@ -582,8 +582,8 @@ regatom(int *flagp)
 static char *			/* Location. */
 regnode(char op)
 {
-	register char *ret;
-	register char *ptr;
+	char *ret;
+	char *ptr;
 
 	ret = regcode;
 	if (ret == &regdummy) {
@@ -620,9 +620,9 @@ regc(char b)
 static void
 reginsert(char op, char *opnd)
 {
-	register char *src;
-	register char *dst;
-	register char *place;
+	char *src;
+	char *dst;
+	char *place;
 
 	if (regcode == &regdummy) {
 		regsize += 3;
@@ -647,9 +647,9 @@ reginsert(char op, char *opnd)
 static void
 regtail(char *p, char *val)
 {
-	register char *scan;
-	register char *temp;
-	register int offset;
+	char *scan;
+	char *temp;
+	int offset;
 
 	if (p == &regdummy)
 		return;
@@ -712,9 +712,15 @@ STATIC char *regprop();
  - regexec - match a regexp against a string
  */
 int
+<<<<<<< ca7d34b7ff5f017e3228714bb583266f7cdf946f
 tpt_regexec(register regexp *prog, register char *string)
+=======
+tpt_regexec(prog, string)
+regexp *prog;
+char *string;
+>>>>>>> dtdocbook: remove register keyword
 {
-	register char *s;
+	char *s;
 
 	/* Be paranoid... */
 	if (prog == NULL || string == NULL) {
@@ -773,9 +779,9 @@ tpt_regexec(register regexp *prog, register char *string)
 static int			/* 0 failure, 1 success */
 regtry(regexp *prog, char *string)
 {
-	register int i;
-	register char **sp;
-	register char **ep;
+	int i;
+	char **sp;
+	char **ep;
 
 	reginput = string;
 	regstartp = prog->startp;
@@ -808,7 +814,7 @@ regtry(regexp *prog, char *string)
 static int			/* 0 failure, 1 success */
 regmatch(char *prog)
 {
-	register char *scan;	/* Current node. */
+	char *scan;	/* Current node. */
 	char *next;		/* Next node. */
 
 	scan = prog;
@@ -838,8 +844,8 @@ regmatch(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. */
@@ -874,8 +880,8 @@ regmatch(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;
@@ -902,8 +908,8 @@ regmatch(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;
@@ -922,7 +928,7 @@ regmatch(char *prog)
 			}
 			break;
 		case BRANCH: {
-				register char *save;
+				char *save;
 
 				if (OP(next) != BRANCH)		/* No choice. */
 					next = OPERAND(scan);	/* Avoid recursion. */
@@ -941,10 +947,10 @@ regmatch(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
@@ -994,9 +1000,9 @@ regmatch(char *prog)
 static int
 regrepeat(char *p)
 {
-	register int count = 0;
-	register char *scan;
-	register char *opnd;
+	int count = 0;
+	char *scan;
+	char *opnd;
 
 	scan = reginput;
 	opnd = OPERAND(p);
@@ -1037,9 +1043,14 @@ regrepeat(char *p)
  - regnext - dig the "next" pointer out of a node
  */
 static char *
+<<<<<<< ca7d34b7ff5f017e3228714bb583266f7cdf946f
 regnext(register char *p)
+=======
+regnext(p)
+char *p;
+>>>>>>> dtdocbook: remove register keyword
 {
-	register int offset;
+	int offset;
 
 	if (p == &regdummy)
 		return(NULL);
@@ -1064,9 +1075,9 @@ STATIC char *regprop();
 void
 regdump(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;
 
 
 	s = r->program + 1;
@@ -1106,7 +1117,7 @@ regdump(regexp *r)
 static char *
 regprop(char *op)
 {
-	register char *p;
+	char *p;
 	static char buf[50];
 
 	(void) strcpy(buf, ":");
@@ -1197,9 +1208,9 @@ regprop(char *op)
 static int
 strcspn(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++) {

cde/programs/dtdocbook/lib/tptregexp/regsub.c

@@ -57,11 +57,11 @@
 void
 tpt_regsub(regexp *prog, 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) {

cde/programs/dtdocbook/lib/tptregexp/timer.c

@@ -135,7 +135,7 @@ int lineno = 0;
 multiple(ncomp, nexec, nsub)
 int ncomp, nexec, nsub;
 {
-	register int i;
+	int i;
 	extern char *strchr();
 
 	errreport = 1;
@@ -151,7 +151,7 @@ int ncomp, nexec, nsub;
 {
 	regexp *r;
 	char dbuf[BUFSIZ];
-	register int i;
+	int i;
 
 	errseen = NULL;
 	r = tpt_regcomp(fields.re);