[Pcre-svn] [1084] code/trunk: pcre32: More 32-bit cleanlines…

Revision: 1084

          http://vcs.pcre.org/viewvc?view=rev&revision=1084
Author:   chpe
Date:     2012-10-16 16:55:28 +0100 (Tue, 16 Oct 2012)

Log Message:
-----------
pcre32: More 32-bit cleanliness fixes

Modified Paths:
--------------
    code/trunk/pcre_compile.c
    code/trunk/pcre_dfa_exec.c
    code/trunk/pcre_exec.c
    code/trunk/pcre_jit_compile.c
    code/trunk/pcre_study.c

Modified: code/trunk/pcre_compile.c
===================================================================
--- code/trunk/pcre_compile.c    2012-10-16 15:55:24 UTC (rev 1083)
+++ code/trunk/pcre_compile.c    2012-10-16 15:55:28 UTC (rev 1084)
@@ -7643,7 +7643,7 @@
              *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;
    const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl,
      TRUE);
-   register int op = *scode;
+   register pcre_uchar op = *scode;

    switch(op)
      {

Modified: code/trunk/pcre_dfa_exec.c
===================================================================
--- code/trunk/pcre_dfa_exec.c    2012-10-16 15:55:24 UTC (rev 1083)
+++ code/trunk/pcre_dfa_exec.c    2012-10-16 15:55:28 UTC (rev 1084)
@@ -571,7 +571,7 @@
   {
   int i, j;
   int clen, dlen;
-  unsigned int c, d;
+  pcre_uint32 c, d;
   int forced_fail = 0;
   BOOL partial_newline = FALSE;
   BOOL could_continue = reset_could_continue;
@@ -3493,7 +3493,7 @@
             {
             while (p < end_subject)
               {
-              register int pp = *p++;
+              register pcre_uint32 pp = *p++;
               if (pp == req_char || pp == req_char2) { p--; break; }
               }
             }

Modified: code/trunk/pcre_exec.c
===================================================================
--- code/trunk/pcre_exec.c    2012-10-16 15:55:24 UTC (rev 1083)
+++ code/trunk/pcre_exec.c    2012-10-16 15:55:28 UTC (rev 1084)
@@ -191,7 +191,7 @@
     PCRE_PUCHAR endptr = p + length;
     while (p < endptr)
       {
-      unsigned int c, d;
+      pcre_uint32 c, d;
       const ucd_record *ur;
       if (eptr >= md->end_subject) return -2;   /* Partial match */
       GETCHARINC(c, eptr);
@@ -499,7 +499,7 @@

 register int  rrc;         /* Returns from recursive calls */
 register int  i;           /* Used for loops not involving calls to RMATCH() */
-register unsigned int c;   /* Character values not kept over RMATCH() calls */
+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 */
@@ -629,7 +629,7 @@
int min;
int number;
int offset;
-int op;
+pcre_uchar op;
int save_capture_last;
int save_offset1, save_offset2, save_offset3;
int stacksave[REC_STACK_SAVE_MAX];
@@ -3197,7 +3197,7 @@

       else
         {
-        unsigned int dc;
+        pcre_uint32 dc;
         GETCHARINC(dc, eptr);
         ecode += length;

@@ -6745,7 +6745,7 @@
           {
           while (p < end_subject)
             {
-            register int pp = *p++;
+            register pcre_uint32 pp = *p++;
             if (pp == req_char || pp == req_char2) { p--; break; }
             }
           }

Modified: code/trunk/pcre_jit_compile.c
===================================================================
--- code/trunk/pcre_jit_compile.c    2012-10-16 15:55:24 UTC (rev 1083)
+++ code/trunk/pcre_jit_compile.c    2012-10-16 15:55:28 UTC (rev 1084)
@@ -2953,7 +2953,7 @@
 struct sljit_jump *found;
 struct sljit_jump *foundoc = NULL;
 struct sljit_jump *notfound;
-pcre_uchar oc, bit;
+pcre_uint32 oc, bit;

SLJIT_ASSERT(common->req_char_ptr != 0);
OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_LOCALS_REG), common->req_char_ptr);

Modified: code/trunk/pcre_study.c
===================================================================
--- code/trunk/pcre_study.c    2012-10-16 15:55:24 UTC (rev 1083)
+++ code/trunk/pcre_study.c    2012-10-16 15:55:28 UTC (rev 1084)
@@ -98,7 +98,7 @@
   {
   int d, min;
   pcre_uchar *cs, *ce;
-  register int op = *cc;
+  register pcre_uchar op = *cc;

   switch (op)
     {