OSSP CVS Repository

ossp - Check-in [1545]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 1545
Date: 2002-Jan-11 11:36:14 (local)
2002-Jan-11 10:36:14 (UTC)
User:rse
Branch:
Comment: upgrade to PCRE 3.9
Tickets:
Inspections:
Files:
ossp-pkg/l2/l2_ut_pcre.c      1.5 -> 1.6     91 inserted, 79 deleted
ossp-pkg/l2/l2_ut_pcre.h      1.5 -> 1.6     3 inserted, 3 deleted

ossp-pkg/l2/l2_ut_pcre.c 1.5 -> 1.6

--- l2_ut_pcre.c 2001/12/21 10:50:01     1.5
+++ l2_ut_pcre.c 2002/01/11 10:36:14     1.6
@@ -6,7 +6,7 @@
  *  DO NOT EDIT THIS FILE, IT WAS AUTOMATICALLY GENERATED!
  *
  *  This is an automatically generated, extremely stripped down
- *  version of the PCRE 3.8 library from the Philip Hazel.
+ *  version of the PCRE 3.9 library from the Philip Hazel.
  *  This version is still distributed under the same original PCRE
  *  Open Source license, but Philip Hazel is no longer responsible
  *  for this version.
@@ -596,8 +596,8 @@
                                         while ((cd->ctypes[*pt] & ctype_xdigit) != 0) {
                                                 count++;
                                                 c = c * 16 + cd->lcc[*pt] -
-                                                        (((cd->
-                                                           ctypes[*pt] & ctype_digit) != 0) ? '0' : 'W');
+                                                        (((cd->ctypes[*pt] & ctype_digit) !=
+                                                          0) ? '0' : 'W');
                                                 pt++;
                                         }
                                         if (*pt == '}') {
@@ -965,7 +965,8 @@
                                                 }
 
                                                 if ((options & PCRE_CASELESS) != 0
-                                                        && posix_class <= 2) posix_class = 0;
+                                                        && posix_class <= 2)
+                                                        posix_class = 0;
 
                                                 posix_class *= 3;
                                                 for (i = 0; i < 3; i++) {
@@ -986,8 +987,7 @@
                                         }
 
                                         if (c == '\\') {
-                                                c =
-                                                        check_escape(&ptr, errorptr, *brackets, options,
+                                                c = check_escape(&ptr, errorptr, *brackets, options,
                                                                                  TRUE, cd);
                                                 if (-c == ESC_b)
                                                         c = '\b';
@@ -1051,8 +1051,7 @@
 
                                                 if (d == '\\') {
                                                         const uschar *oldptr = ptr;
-                                                        d =
-                                                                check_escape(&ptr, errorptr, *brackets,
+                                                        d = check_escape(&ptr, errorptr, *brackets,
                                                                                          options, TRUE, cd);
 
 #ifdef L2_UT_PCRE_SUPPORT_UTF8
@@ -1528,8 +1527,8 @@
                                                                    errorptr, (bravalue == OP_ASSERTBACK
                                                                                           || bravalue ==
                                                                                           OP_ASSERTBACK_NOT), skipbytes,
-                                                                   &subreqchar, &subcountlits,
-                                                                   cd)) goto FAILED;
+                                                                   &subreqchar, &subcountlits, cd))
+                                        goto FAILED;
 
                                 else if (bravalue == OP_COND) {
                                         uschar *tc = code;
@@ -1567,8 +1566,7 @@
 
                         case '\\':
                                 tempptr = ptr;
-                                c =
-                                        check_escape(&ptr, errorptr, *brackets, options, FALSE,
+                                c = check_escape(&ptr, errorptr, *brackets, options, FALSE,
                                                                  cd);
 
                                 if (c < 0) {
@@ -1610,8 +1608,7 @@
 
                                         if (c == '\\') {
                                                 tempptr = ptr;
-                                                c =
-                                                        check_escape(&ptr, errorptr, *brackets, options,
+                                                c = check_escape(&ptr, errorptr, *brackets, options,
                                                                                  FALSE, cd);
                                                 if (c < 0) {
                                                         ptr = tempptr;
@@ -1802,7 +1799,7 @@
                 }
                 else if (op != OP_SOD &&
                                  ((*options & PCRE_MULTILINE) != 0 || op != OP_CIRC))
-                                return FALSE;
+                        return FALSE;
                 code += (code[1] << 8) + code[2];
         }
         while (*code == OP_ALT);
@@ -1947,8 +1944,7 @@
                         case '\\':
                                 {
                                         const uschar *save_ptr = ptr;
-                                        c =
-                                                check_escape(&ptr, errorptr, bracount, options, FALSE,
+                                        c = check_escape(&ptr, errorptr, bracount, options, FALSE,
                                                                          &compile_block);
                                         if (*errorptr != NULL)
                                                 goto PCRE_ERROR_RETURN;
@@ -2114,12 +2110,11 @@
                                                         goto PCRE_ERROR_RETURN;
 
                                                 case '(':
-                                                        if ((compile_block.ctypes[ptr[3]] & ctype_digit)
-                                                                != 0) {
+                                                        if ((compile_block.
+                                                                 ctypes[ptr[3]] & ctype_digit) != 0) {
                                                                 ptr += 4;
                                                                 length += 3;
-                                                                while (
-                                                                           (compile_block.
+                                                                while ((compile_block.
                                                                                 ctypes[*ptr] & ctype_digit) != 0)
                                                                         ptr++;
                                                                 if (*ptr != ')') {
@@ -2186,8 +2181,7 @@
                                                                                 if (((set | unset) & PCRE_IMS) != 0) {
                                                                                         length += 4;
                                                                                         branch_newextra = 2;
-                                                                                        if (
-                                                                                                ((set | unset) &
+                                                                                        if (((set | unset) &
                                                                                                  PCRE_CASELESS) != 0)
                                                                                                 options |= PCRE_ICHANGED;
                                                                                 }
@@ -2203,8 +2197,8 @@
                                                         if (c == ')') {
                                                                 if (branch_newextra == 2
                                                                         && (branch_extra == 0
-                                                                                || branch_extra == 3)) branch_extra +=
-                                                                                branch_newextra;
+                                                                                || branch_extra == 3))
+                                                                        branch_extra += branch_newextra;
                                                                 continue;
                                                         }
 
@@ -2295,8 +2289,7 @@
 
                                         if (c == '\\') {
                                                 const uschar *saveptr = ptr;
-                                                c =
-                                                        check_escape(&ptr, errorptr, bracount, options,
+                                                c = check_escape(&ptr, errorptr, bracount, options,
                                                                                  FALSE, &compile_block);
                                                 if (*errorptr != NULL)
                                                         goto PCRE_ERROR_RETURN;
@@ -2354,8 +2347,8 @@
         code = re->code;
         *code = OP_BRA;
         bracount = 0;
-        (void)compile_regex(options, -1, &bracount, &code, &ptr, errorptr, FALSE, 0,
-                                                &reqchar, &countlits, &compile_block);
+        (void)compile_regex(options, -1, &bracount, &code, &ptr, errorptr, FALSE,
+                                                0, &reqchar, &countlits, &compile_block);
         re->top_bracket = bracount;
         re->top_backref = top_backref;
 
@@ -2462,7 +2455,8 @@
                                 do {
                                         if (match
                                                 (eptr, ecode + 3, offset_top, md, ims, eptrb,
-                                                 match_isgroup)) return TRUE;
+                                                 match_isgroup))
+                                                return TRUE;
                                         ecode += (ecode[1] << 8) + ecode[2];
                                 }
                                 while (*ecode == OP_ALT);
@@ -2484,7 +2478,8 @@
                                 do {
                                         if (match
                                                 (eptr, ecode + 3, offset_top, md, ims, eptrb,
-                                                 match_isgroup)) return TRUE;
+                                                 match_isgroup))
+                                                return TRUE;
                                         ecode += (ecode[1] << 8) + ecode[2];
                                 }
                                 while (*ecode == OP_ALT);
@@ -2496,8 +2491,7 @@
                                         int offset = (ecode[4] << 9) | (ecode[5] << 1);
                                         return match(eptr,
                                                                  ecode +
-                                                                 ((offset
-                                                                   < offset_top
+                                                                 ((offset < offset_top
                                                                    && md->offset_vector[offset] >=
                                                                    0) ? 6 : 3 + (ecode[1] << 8) + ecode[2]),
                                                                  offset_top, md, ims, eptrb, match_isgroup);
@@ -2539,7 +2533,8 @@
                                 do {
                                         if (match
                                                 (eptr, ecode + 3, offset_top, md, ims, NULL,
-                                                 match_isgroup)) break;
+                                                 match_isgroup))
+                                                break;
                                         ecode += (ecode[1] << 8) + ecode[2];
                                 }
                                 while (*ecode == OP_ALT);
@@ -2561,7 +2556,8 @@
                                 do {
                                         if (match
                                                 (eptr, ecode + 3, offset_top, md, ims, NULL,
-                                                 match_isgroup)) return FALSE;
+                                                 match_isgroup))
+                                                return FALSE;
                                         ecode += (ecode[1] << 8) + ecode[2];
                                 }
                                 while (*ecode == OP_ALT);
@@ -2608,9 +2604,8 @@
 
                                         for (i = 1; i <= c; i++)
                                                 save[i] = md->offset_vector[md->offset_end - i];
-                                        rc =
-                                                match(eptr, md->start_pattern, offset_top, md, ims,
-                                                          eptrb, match_isgroup);
+                                        rc = match(eptr, md->start_pattern, offset_top, md, ims,
+                                                           eptrb, match_isgroup);
                                         for (i = 1; i <= c; i++)
                                                 md->offset_vector[md->offset_end - i] = save[i];
                                         if (save != stacksave)
@@ -2632,7 +2627,8 @@
                                         do {
                                                 if (match
                                                         (eptr, ecode + 3, offset_top, md, ims, eptrb,
-                                                         match_isgroup)) break;
+                                                         match_isgroup))
+                                                        break;
                                                 ecode += (ecode[1] << 8) + ecode[2];
                                         }
                                         while (*ecode == OP_ALT);
@@ -2661,7 +2657,8 @@
                                                 if (match
                                                         (eptr, ecode + 3, offset_top, md, ims, eptrb, 0)
                                                         || match(eptr, prev, offset_top, md, ims, eptrb,
-                                                                         match_isgroup)) return TRUE;
+                                                                         match_isgroup))
+                                                        return TRUE;
                                         }
                                         else {
                                                 if (match
@@ -2685,7 +2682,8 @@
                                         const uschar *next = ecode + 1;
                                         if (match
                                                 (eptr, next, offset_top, md, ims, eptrb,
-                                                 match_isgroup)) return TRUE;
+                                                 match_isgroup))
+                                                return TRUE;
                                         do
                                                 next += (next[1] << 8) + next[2];
                                         while (*next == OP_ALT);
@@ -2701,7 +2699,8 @@
                                         while (*next == OP_ALT);
                                         if (match
                                                 (eptr, next + 3, offset_top, md, ims, eptrb,
-                                                 match_isgroup)) return TRUE;
+                                                 match_isgroup))
+                                                return TRUE;
                                         ecode++;
                                 }
                                 break;
@@ -2757,7 +2756,8 @@
                                                 if (match
                                                         (eptr, ecode + 3, offset_top, md, ims, eptrb, 0)
                                                         || match(eptr, prev, offset_top, md, ims, eptrb,
-                                                                         match_isgroup)) return TRUE;
+                                                                         match_isgroup))
+                                                        return TRUE;
                                         }
                                         else {
                                                 if (match
@@ -2833,7 +2833,8 @@
                                                 ((md->ctypes[*eptr] & ctype_word) != 0);
                                         if ((*ecode++ == OP_WORD_BOUNDARY) ?
                                                 cur_is_word == prev_is_word : cur_is_word !=
-                                                prev_is_word) return FALSE;
+                                                prev_is_word)
+                                                return FALSE;
                                 }
                                 break;
 
@@ -2952,8 +2953,8 @@
                                         if (minimize) {
                                                 for (i = min;; i++) {
                                                         if (match
-                                                                (eptr, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                (eptr, ecode, offset_top, md, ims, eptrb, 0))
+                                                                return TRUE;
                                                         if (i >= max
                                                                 || !match_ref(offset, eptr, length, md, ims))
                                                                 return FALSE;
@@ -2970,8 +2971,8 @@
                                                 }
                                                 while (eptr >= pp) {
                                                         if (match
-                                                                (eptr, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                (eptr, ecode, offset_top, md, ims, eptrb, 0))
+                                                                return TRUE;
                                                         eptr -= length;
                                                 }
                                                 return FALSE;
@@ -3033,8 +3034,8 @@
                                         if (minimize) {
                                                 for (i = min;; i++) {
                                                         if (match
-                                                                (eptr, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                (eptr, ecode, offset_top, md, ims, eptrb, 0))
+                                                                return TRUE;
                                                         if (i >= max || eptr >= md->end_subject)
                                                                 return FALSE;
                                                         GETCHARINC(c, eptr)
@@ -3067,7 +3068,8 @@
                                                 while (eptr >= pp) {
                                                         if (match
                                                                 (eptr--, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                 0))
+                                                                return TRUE;
 
 #ifdef L2_UT_PCRE_SUPPORT_UTF8
                                                         BACKCHAR(eptr)
@@ -3138,10 +3140,10 @@
                                         if (minimize) {
                                                 for (i = min;; i++) {
                                                         if (match
-                                                                (eptr, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
-                                                        if (i >= max || eptr >= md->end_subject
-                                                                || c != md->lcc[*eptr++])
+                                                                (eptr, ecode, offset_top, md, ims, eptrb, 0))
+                                                                return TRUE;
+                                                        if (i >= max || eptr >= md->end_subject ||
+                                                                c != md->lcc[*eptr++])
                                                                 return FALSE;
                                                 }
                                         }
@@ -3149,13 +3151,15 @@
                                                 const uschar *pp = eptr;
                                                 for (i = min; i < max; i++) {
                                                         if (eptr >= md->end_subject
-                                                                || c != md->lcc[*eptr]) break;
+                                                                || c != md->lcc[*eptr])
+                                                                break;
                                                         eptr++;
                                                 }
                                                 while (eptr >= pp)
                                                         if (match
                                                                 (eptr--, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                 0))
+                                                                return TRUE;
                                                 return FALSE;
                                         }
                                 }
@@ -3169,8 +3173,8 @@
                                         if (minimize) {
                                                 for (i = min;; i++) {
                                                         if (match
-                                                                (eptr, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                (eptr, ecode, offset_top, md, ims, eptrb, 0))
+                                                                return TRUE;
                                                         if (i >= max || eptr >= md->end_subject
                                                                 || c != *eptr++)
                                                                 return FALSE;
@@ -3186,7 +3190,8 @@
                                                 while (eptr >= pp)
                                                         if (match
                                                                 (eptr--, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                 0))
+                                                                return TRUE;
                                                 return FALSE;
                                         }
                                 }
@@ -3246,10 +3251,10 @@
                                         if (minimize) {
                                                 for (i = min;; i++) {
                                                         if (match
-                                                                (eptr, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
-                                                        if (i >= max || eptr >= md->end_subject
-                                                                || c == md->lcc[*eptr++])
+                                                                (eptr, ecode, offset_top, md, ims, eptrb, 0))
+                                                                return TRUE;
+                                                        if (i >= max || eptr >= md->end_subject ||
+                                                                c == md->lcc[*eptr++])
                                                                 return FALSE;
                                                 }
                                         }
@@ -3257,13 +3262,15 @@
                                                 const uschar *pp = eptr;
                                                 for (i = min; i < max; i++) {
                                                         if (eptr >= md->end_subject
-                                                                || c == md->lcc[*eptr]) break;
+                                                                || c == md->lcc[*eptr])
+                                                                break;
                                                         eptr++;
                                                 }
                                                 while (eptr >= pp)
                                                         if (match
                                                                 (eptr--, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                 0))
+                                                                return TRUE;
                                                 return FALSE;
                                         }
                                 }
@@ -3277,8 +3284,8 @@
                                         if (minimize) {
                                                 for (i = min;; i++) {
                                                         if (match
-                                                                (eptr, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                (eptr, ecode, offset_top, md, ims, eptrb, 0))
+                                                                return TRUE;
                                                         if (i >= max || eptr >= md->end_subject
                                                                 || c == *eptr++)
                                                                 return FALSE;
@@ -3294,7 +3301,8 @@
                                                 while (eptr >= pp)
                                                         if (match
                                                                 (eptr--, ecode, offset_top, md, ims, eptrb,
-                                                                 0)) return TRUE;
+                                                                 0))
+                                                                return TRUE;
                                                 return FALSE;
                                         }
                                 }
@@ -3481,7 +3489,8 @@
                                                         if ((ims & PCRE_DOTALL) == 0) {
                                                                 for (i = min; i < max; i++) {
                                                                         if (eptr >= md->end_subject
-                                                                                || *eptr == '\n') break;
+                                                                                || *eptr == '\n')
+                                                                                break;
                                                                         eptr++;
                                                                 }
                                                         }
@@ -3550,8 +3559,8 @@
 
                                         while (eptr >= pp) {
                                                 if (match
-                                                        (eptr--, ecode, offset_top, md, ims, eptrb,
-                                                         0)) return TRUE;
+                                                        (eptr--, ecode, offset_top, md, ims, eptrb, 0))
+                                                        return TRUE;
 #ifdef L2_UT_PCRE_SUPPORT_UTF8
                                                 if (md->utf8)
                                                         while (eptr > pp && (*eptr & 0xc0) == 0x80)
@@ -3656,9 +3665,8 @@
                         if ((ims & PCRE_CASELESS) != 0)
                                 first_char = match_block.lcc[first_char];
                 }
-                else
-                        if (!startline && extra != NULL &&
-                                (extra->options & PCRE_STUDY_MAPPED) != 0)
+                else if (!startline && extra != NULL &&
+                                 (extra->options & PCRE_STUDY_MAPPED) != 0)
                         start_bits = extra->start_bits;
         }
 
@@ -3683,7 +3691,8 @@
                                         start_match++;
                         else
                                 while (start_match < end_subject
-                                           && *start_match != first_char) start_match++;
+                                           && *start_match != first_char)
+                                        start_match++;
                 }
 
                 else if (startline) {
@@ -3737,7 +3746,8 @@
                 match_block.start_match = start_match;
                 if (!match
                         (start_match, re->code, 2, &match_block, ims, NULL,
-                         match_isgroup)) continue;
+                         match_isgroup))
+                        continue;
 
                 if (using_temporary_offsets) {
                         if (offsetcount >= 4) {
@@ -3829,7 +3839,8 @@
                                         case OP_BRAZERO:
                                         case OP_BRAMINZERO:
                                                 if (!set_start_bits
-                                                        (++tcode, start_bits, caseless, cd)) return FALSE;
+                                                        (++tcode, start_bits, caseless, cd))
+                                                        return FALSE;
                                                 dummy = 1;
                                                 do
                                                         tcode += (tcode[1] << 8) + tcode[2];
@@ -4025,7 +4036,8 @@
         memset(start_bits, 0, 32 * sizeof (uschar));
         if (!set_start_bits
                 (re->code, start_bits, (re->options & PCRE_CASELESS) != 0,
-                 &compile_block)) return NULL;
+                 &compile_block))
+                return NULL;
 
         extra = (pcre_extra_st *) (pcre_malloc) (sizeof (pcre_extra_st));
 


ossp-pkg/l2/l2_ut_pcre.h 1.5 -> 1.6

--- l2_ut_pcre.h 2001/12/21 10:50:01     1.5
+++ l2_ut_pcre.h 2002/01/11 10:36:14     1.6
@@ -6,7 +6,7 @@
  *  DO NOT EDIT THIS FILE, IT WAS AUTOMATICALLY GENERATED!
  *
  *  This is an automatically generated, extremely stripped down
- *  version of the PCRE 3.8 library from the Philip Hazel.
+ *  version of the PCRE 3.9 library from the Philip Hazel.
  *  This version is still distributed under the same original PCRE
  *  Open Source license, but Philip Hazel is no longer responsible
  *  for this version.
@@ -48,8 +48,8 @@
 #define PCRE_PREFIX l2_util_
 
 #define PCRE_MAJOR          3
-#define PCRE_MINOR          8
-#define PCRE_DATE           18-Dec-2001
+#define PCRE_MINOR          9
+#define PCRE_DATE           02-Jan-2002
 
 #ifdef PCRE_PREFIX
 #if defined(__STDC__) || defined(__cplusplus)

CVSTrac 2.0.1