diff --git a/uppsrc/plugin/pcre/lib/pcre_compile.c b/uppsrc/plugin/pcre/lib/pcre_compile.c index 5777147bb..b98ae401c 100644 --- a/uppsrc/plugin/pcre/lib/pcre_compile.c +++ b/uppsrc/plugin/pcre/lib/pcre_compile.c @@ -1067,7 +1067,7 @@ else c = 0; for (i = 0; i < 4; ++i) { - register pcre_uint32 cc = *(++ptr); + /*register*/ pcre_uint32 cc = *(++ptr); #ifndef EBCDIC /* ASCII/UTF-8 coding */ if (cc >= CHAR_a) cc -= 32; /* Convert to upper case */ c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10)); @@ -1278,7 +1278,7 @@ else overflow = FALSE; while (*ptr >= CHAR_0 && *ptr <= CHAR_7) { - register pcre_uint32 cc = *ptr++; + /*register*/ pcre_uint32 cc = *ptr++; if (c == 0 && cc == CHAR_0) continue; /* Leading zeroes */ #ifdef COMPILE_PCRE32 if (c >= 0x20000000l) { overflow = TRUE; break; } @@ -1317,7 +1317,7 @@ else c = 0; for (i = 0; i < 2; ++i) { - register pcre_uint32 cc = *(++ptr); + /*register*/ pcre_uint32 cc = *(++ptr); #ifndef EBCDIC /* ASCII/UTF-8 coding */ if (cc >= CHAR_a) cc -= 32; /* Convert to upper case */ c = (c << 4) + cc - ((cc < CHAR_A)? CHAR_0 : (CHAR_A - 10)); @@ -1350,7 +1350,7 @@ else overflow = FALSE; while (MAX_255(*ptr) && (digitab[*ptr] & ctype_xdigit) != 0) { - register pcre_uint32 cc = *ptr++; + /*register*/ pcre_uint32 cc = *ptr++; if (c == 0 && cc == CHAR_0) continue; /* Leading zeroes */ #ifdef COMPILE_PCRE32 @@ -1739,8 +1739,8 @@ find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd, { int length = -1; recurse_check this_recurse; -register int branchlength = 0; -register pcre_uchar *cc = code + 1 + LINK_SIZE; +/*register*/ int branchlength = 0; +/*register*/ pcre_uchar *cc = code + 1 + LINK_SIZE; /* Scan along the opcodes for this branch. If we get to the end of the branch, check the length against that of the other branches. */ @@ -1749,7 +1749,7 @@ for (;;) { int d; pcre_uchar *ce, *cs; - register pcre_uchar op = *cc; + /*register*/ pcre_uchar op = *cc; switch (op) { @@ -2082,7 +2082,7 @@ PRIV(find_bracket)(const pcre_uchar *code, BOOL utf, int number) { for (;;) { - register pcre_uchar c = *code; + /*register*/ pcre_uchar c = *code; if (c == OP_END) return NULL; @@ -2245,7 +2245,7 @@ find_recurse(const pcre_uchar *code, BOOL utf) { for (;;) { - register pcre_uchar c = *code; + /*register*/ pcre_uchar c = *code; if (c == OP_END) return NULL; if (c == OP_RECURSE) return code; @@ -2397,7 +2397,7 @@ static BOOL could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode, BOOL utf, compile_data *cd, recurse_check *recurses) { -register pcre_uchar c; +/*register*/ pcre_uchar c; recurse_check this_recurse; for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE); @@ -3659,7 +3659,7 @@ Returns: nothing static void auto_possessify(pcre_uchar *code, BOOL utf, const compile_data *cd) { -register pcre_uchar c; +/*register*/ pcre_uchar c; const pcre_uchar *end; pcre_uchar *repeat_opcode; pcre_uint32 list[8]; @@ -3973,7 +3973,7 @@ static int check_posix_name(const pcre_uchar *ptr, int len) { const char *pn = posix_names; -register int yield = 0; +/*register*/ int yield = 0; while (posix_name_lengths[yield] != 0) { if (len == posix_name_lengths[yield] && @@ -4469,9 +4469,9 @@ pcre_int32 req_caseopt, reqvary, tempreqvary; int options = *optionsptr; /* May change dynamically */ int after_manual_callout = 0; int length_prevgroup = 0; -register pcre_uint32 c; +/*register*/ pcre_uint32 c; int escape; -register pcre_uchar *code = *codeptr; +/*register*/ pcre_uchar *code = *codeptr; pcre_uchar *last_code = code; pcre_uchar *orig_code = code; pcre_uchar *tempcode; @@ -5011,7 +5011,7 @@ for (;; ptr++) { BOOL local_negate = FALSE; int posix_class, taboffset, tabopt; - register const pcre_uint8 *cbits = cd->cbits; + /*register*/ const pcre_uint8 *cbits = cd->cbits; pcre_uint8 pbits[32]; if (ptr[1] != CHAR_COLON) @@ -5192,7 +5192,7 @@ for (;; ptr++) else { - register const pcre_uint8 *cbits = cd->cbits; + /*register*/ const pcre_uint8 *cbits = cd->cbits; /* Every class contains at least two < 256 characters. */ class_has_8bitchar++; /* Every class contains at least two characters. */ @@ -6052,7 +6052,7 @@ for (;; ptr++) else if (*previous >= OP_ASSERT && *previous <= OP_COND) { - register int i; + /*register*/ int i; int len = (int)(code - previous); size_t base_hwm_offset = item_hwm_offset; pcre_uchar *bralink = NULL; @@ -8656,13 +8656,13 @@ Returns: TRUE or FALSE */ static BOOL -is_anchored(register const pcre_uchar *code, unsigned int bracket_map, +is_anchored(/*register*/ const pcre_uchar *code, unsigned int bracket_map, compile_data *cd, int atomcount) { do { const pcre_uchar *scode = first_significant_code( code + PRIV(OP_lengths)[*code], FALSE); - register int op = *scode; + /*register*/ int op = *scode; /* Non-capturing brackets */ @@ -8753,7 +8753,7 @@ is_startline(const pcre_uchar *code, unsigned int bracket_map, do { const pcre_uchar *scode = first_significant_code( code + PRIV(OP_lengths)[*code], FALSE); - register int op = *scode; + /*register*/ int op = *scode; /* If we are at the start of a conditional assertion group, *both* the conditional assertion *and* what follows the condition must satisfy the test @@ -8871,7 +8871,7 @@ static pcre_uint32 find_firstassertedchar(const pcre_uchar *code, pcre_int32 *flags, BOOL inassert) { -register pcre_uint32 c = 0; +/*register*/ pcre_uint32 c = 0; int cflags = REQ_NONE; *flags = REQ_NONE; @@ -8882,7 +8882,7 @@ do { *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0; const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl, TRUE); - register pcre_uchar op = *scode; + /*register*/ pcre_uchar op = *scode; switch(op) { diff --git a/uppsrc/plugin/pcre/lib/pcre_dfa_exec.c b/uppsrc/plugin/pcre/lib/pcre_dfa_exec.c index bc09ced3a..6648849bf 100644 --- a/uppsrc/plugin/pcre/lib/pcre_dfa_exec.c +++ b/uppsrc/plugin/pcre/lib/pcre_dfa_exec.c @@ -3524,7 +3524,7 @@ for (;;) { while (current_subject < end_subject) { - register pcre_uint32 c = UCHAR21TEST(current_subject); + /*register*/ pcre_uint32 c = UCHAR21TEST(current_subject); #ifndef COMPILE_PCRE8 if (c > 255) c = 255; #endif @@ -3570,7 +3570,7 @@ for (;;) if (has_req_char && end_subject - current_subject < REQ_BYTE_MAX) { - register PCRE_PUCHAR p = current_subject + (has_first_char? 1:0); + /*register*/ PCRE_PUCHAR p = current_subject + (has_first_char? 1:0); /* We don't need to repeat the search if we haven't yet reached the place we found it at last time. */ @@ -3581,7 +3581,7 @@ for (;;) { while (p < end_subject) { - register pcre_uint32 pp = UCHAR21INCTEST(p); + /*register*/ pcre_uint32 pp = UCHAR21INCTEST(p); if (pp == req_char || pp == req_char2) { p--; break; } } } diff --git a/uppsrc/plugin/pcre/lib/pcre_exec.c b/uppsrc/plugin/pcre/lib/pcre_exec.c index 1a9bdd546..072e6bd6f 100644 --- a/uppsrc/plugin/pcre/lib/pcre_exec.c +++ b/uppsrc/plugin/pcre/lib/pcre_exec.c @@ -162,11 +162,11 @@ Returns: >= 0 the number of subject bytes matched */ static int -match_ref(int offset, register PCRE_PUCHAR eptr, int length, match_data *md, +match_ref(int offset, /*register*/ PCRE_PUCHAR eptr, int length, match_data *md, BOOL caseless) { PCRE_PUCHAR eptr_start = eptr; -register PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset]; +/*register*/ PCRE_PUCHAR p = md->start_subject + md->offset_vector[offset]; #if defined SUPPORT_UTF && defined SUPPORT_UCP BOOL utf = md->utf; #endif @@ -317,7 +317,7 @@ versions and production versions. Note that the "rw" argument of RMATCH isn't actually used in this definition. */ #ifndef NO_RECURSE -#define REGISTER register +#define REGISTER /*register*/ #ifdef PCRE_DEBUG #define RMATCH(ra,rb,rc,rd,re,rw) \ @@ -518,10 +518,10 @@ match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode, so they can be ordinary variables in all cases. Mark some of them with "register" because they are used a lot in loops. */ -register int rrc; /* Returns from recursive calls */ -register int i; /* Used for loops not involving calls to RMATCH() */ -register pcre_uint32 c; /* Character values not kept over RMATCH() calls */ -register BOOL utf; /* Local copy of UTF flag for speed */ +/*register*/ int rrc; /* Returns from recursive calls */ +/*register*/ int i; /* Used for loops not involving calls to RMATCH() */ +/*register*/ pcre_uint32 c; /* Character values not kept over RMATCH() calls */ +/*register*/ BOOL utf; /* Local copy of UTF flag for speed */ BOOL minimize, possessive; /* Quantifier options */ BOOL caseless; @@ -1473,8 +1473,8 @@ for (;;) if (offset >= offset_top) { - register int *iptr = md->offset_vector + offset_top; - register int *iend = md->offset_vector + offset; + /*register*/ int *iptr = md->offset_vector + offset_top; + /*register*/ int *iend = md->offset_vector + offset; while (iptr < iend) *iptr++ = -1; offset_top = offset + 2; } @@ -1982,8 +1982,8 @@ for (;;) if (offset > offset_top) { - register int *iptr = md->offset_vector + offset_top; - register int *iend = md->offset_vector + offset; + /*register*/ int *iptr = md->offset_vector + offset_top; + /*register*/ int *iend = md->offset_vector + offset; while (iptr < iend) *iptr++ = -1; } @@ -3667,7 +3667,7 @@ for (;;) #ifdef SUPPORT_UTF if (utf) { - register pcre_uint32 ch, och; + /*register*/ pcre_uint32 ch, och; ecode++; GETCHARINC(ch, ecode); @@ -3694,7 +3694,7 @@ for (;;) else #endif { - register pcre_uint32 ch = ecode[1]; + /*register*/ pcre_uint32 ch = ecode[1]; c = *eptr++; if (ch == c || (op == OP_NOTI && TABLE_GET(ch, md->fcc, ch) == c)) RRETURN(MATCH_NOMATCH); @@ -3808,7 +3808,7 @@ for (;;) #ifdef SUPPORT_UTF if (utf) { - register pcre_uint32 d; + /*register*/ pcre_uint32 d; for (i = 1; i <= min; i++) { if (eptr >= md->end_subject) @@ -3843,7 +3843,7 @@ for (;;) #ifdef SUPPORT_UTF if (utf) { - register pcre_uint32 d; + /*register*/ pcre_uint32 d; for (fi = min;; fi++) { RMATCH(eptr, ecode, offset_top, md, eptrb, RM28); @@ -3888,7 +3888,7 @@ for (;;) #ifdef SUPPORT_UTF if (utf) { - register pcre_uint32 d; + /*register*/ pcre_uint32 d; for (i = min; i < max; i++) { int len = 1; @@ -3945,7 +3945,7 @@ for (;;) #ifdef SUPPORT_UTF if (utf) { - register pcre_uint32 d; + /*register*/ pcre_uint32 d; for (i = 1; i <= min; i++) { if (eptr >= md->end_subject) @@ -3979,7 +3979,7 @@ for (;;) #ifdef SUPPORT_UTF if (utf) { - register pcre_uint32 d; + /*register*/ pcre_uint32 d; for (fi = min;; fi++) { RMATCH(eptr, ecode, offset_top, md, eptrb, RM32); @@ -4023,7 +4023,7 @@ for (;;) #ifdef SUPPORT_UTF if (utf) { - register pcre_uint32 d; + /*register*/ pcre_uint32 d; for (i = min; i < max; i++) { int len = 1; @@ -6681,8 +6681,8 @@ in case they inspect these fields. */ if (md->offset_vector != NULL) { - register int *iptr = md->offset_vector + ocount; - register int *iend = iptr - re->top_bracket; + /*register*/ int *iptr = md->offset_vector + ocount; + /*register*/ int *iend = iptr - re->top_bracket; if (iend < md->offset_vector + 2) iend = md->offset_vector + 2; while (--iptr >= iend) *iptr = -1; if (offsetcount > 0) md->offset_vector[0] = -1; @@ -6830,7 +6830,7 @@ for(;;) { while (start_match < end_subject) { - register pcre_uint32 c = UCHAR21TEST(start_match); + /*register*/ pcre_uint32 c = UCHAR21TEST(start_match); #ifndef COMPILE_PCRE8 if (c > 255) c = 255; #endif @@ -6877,7 +6877,7 @@ for(;;) if (has_req_char && end_subject - start_match < REQ_BYTE_MAX) { - register PCRE_PUCHAR p = start_match + (has_first_char? 1:0); + /*register*/ PCRE_PUCHAR p = start_match + (has_first_char? 1:0); /* We don't need to repeat the search if we haven't yet reached the place we found it at last time. */ @@ -6888,7 +6888,7 @@ for(;;) { while (p < end_subject) { - register pcre_uint32 pp = UCHAR21INCTEST(p); + /*register*/ pcre_uint32 pp = UCHAR21INCTEST(p); if (pp == req_char || pp == req_char2) { p--; break; } } } @@ -7087,7 +7087,7 @@ if (rc == MATCH_MATCH || rc == MATCH_ACCEPT) if (md->end_offset_top/2 <= re->top_bracket && offsets != NULL) { - register int *iptr, *iend; + /*register*/ int *iptr, *iend; int resetcount = 2 + re->top_bracket * 2; if (resetcount > offsetcount) resetcount = offsetcount; iptr = offsets + md->end_offset_top; diff --git a/uppsrc/plugin/pcre/lib/pcre_ord2utf8.c b/uppsrc/plugin/pcre/lib/pcre_ord2utf8.c index 95f1beb96..cd01fd9c4 100644 --- a/uppsrc/plugin/pcre/lib/pcre_ord2utf8.c +++ b/uppsrc/plugin/pcre/lib/pcre_ord2utf8.c @@ -69,7 +69,7 @@ PRIV(ord2utf)(pcre_uint32 cvalue, pcre_uchar *buffer) { #ifdef SUPPORT_UTF -register int i, j; +/*register*/ int i, j; for (i = 0; i < PRIV(utf8_table1_size); i++) if ((int)cvalue <= PRIV(utf8_table1)[i]) break; diff --git a/uppsrc/plugin/pcre/lib/pcre_study.c b/uppsrc/plugin/pcre/lib/pcre_study.c index d9d4960d8..83d754154 100644 --- a/uppsrc/plugin/pcre/lib/pcre_study.c +++ b/uppsrc/plugin/pcre/lib/pcre_study.c @@ -89,8 +89,8 @@ int length = -1; BOOL utf = (options & PCRE_UTF8) != 0; BOOL had_recurse = FALSE; recurse_check this_recurse; -register int branchlength = 0; -register pcre_uchar *cc = (pcre_uchar *)code + 1 + LINK_SIZE; +/*register*/ int branchlength = 0; +/*register*/ pcre_uchar *cc = (pcre_uchar *)code + 1 + LINK_SIZE; if ((*countptr)++ > 1000) return -1; /* too complex */ @@ -104,7 +104,7 @@ for (;;) { int d, min; pcre_uchar *cs, *ce; - register pcre_uchar op = *cc; + /*register*/ pcre_uchar op = *cc; switch (op) { @@ -723,7 +723,7 @@ static void set_type_bits(pcre_uint8 *start_bits, int cbit_type, unsigned int table_limit, compile_data *cd) { -register pcre_uint32 c; +/*register*/ pcre_uint32 c; for (c = 0; c < table_limit; c++) start_bits[c] |= cd->cbits[c+cbit_type]; #if defined SUPPORT_UTF && defined COMPILE_PCRE8 if (table_limit == 32) return; @@ -765,7 +765,7 @@ static void set_nottype_bits(pcre_uint8 *start_bits, int cbit_type, unsigned int table_limit, compile_data *cd) { -register pcre_uint32 c; +/*register*/ pcre_uint32 c; for (c = 0; c < table_limit; c++) start_bits[c] |= ~cd->cbits[c+cbit_type]; #if defined SUPPORT_UTF && defined COMPILE_PCRE8 if (table_limit != 32) for (c = 24; c < 32; c++) start_bits[c] = 0xff; @@ -802,7 +802,7 @@ static int set_start_bits(const pcre_uchar *code, pcre_uint8 *start_bits, BOOL utf, compile_data *cd) { -register pcre_uint32 c; +/*register*/ pcre_uint32 c; int yield = SSB_DONE; #if defined SUPPORT_UTF && defined COMPILE_PCRE8 int table_limit = utf? 16:32; diff --git a/uppsrc/plugin/pcre/lib/pcre_valid_utf8.c b/uppsrc/plugin/pcre/lib/pcre_valid_utf8.c index 3b0f6464a..e27cc5c4c 100644 --- a/uppsrc/plugin/pcre/lib/pcre_valid_utf8.c +++ b/uppsrc/plugin/pcre/lib/pcre_valid_utf8.c @@ -107,7 +107,7 @@ int PRIV(valid_utf)(PCRE_PUCHAR string, int length, int *erroroffset) { #ifdef SUPPORT_UTF -register PCRE_PUCHAR p; +/*register*/ PCRE_PUCHAR p; if (length < 0) { @@ -117,7 +117,7 @@ if (length < 0) for (p = string; length-- > 0; p++) { - register pcre_uchar ab, c, d; + /*register*/ pcre_uchar ab, c, d; c = *p; if (c < 128) continue; /* ASCII character */