Source tidies (trailing spaces) etc. for 10.34-RC1.

git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1180 6239d852-aaf2-0410-a92c-79f79f948069

9 files changed, 24 insertions, 22 deletions

diff --git a/src/config.h.generic b/src/config.h.generic
index 25d45ee..846c897 100644
--- a/src/config.h.generic
+++ b/src/config.h.generic
@@ -218,7 +218,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #define PACKAGE_NAME "PCRE2"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE2 10.33"
+#define PACKAGE_STRING "PCRE2 10.34-RC1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pcre2"
@@ -227,7 +227,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "10.33"
+#define PACKAGE_VERSION "10.34-RC1"
 
 /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
    parentheses (of any kind) in a pattern. This limits the amount of system
@@ -352,7 +352,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #endif
 
 /* Version number of package */
-#define VERSION "10.33"
+#define VERSION "10.34-RC1"
 
 /* Define to 1 if on MINIX. */
 /* #undef _MINIX */
diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic
index 933dd74..3a6f32e 100644
--- a/src/pcre2.h.generic
+++ b/src/pcre2.h.generic
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define PCRE2_MAJOR           10
 #define PCRE2_MINOR           34
 #define PCRE2_PRERELEASE      -RC1
-#define PCRE2_DATE            2019-04-22
+#define PCRE2_DATE            2019-10-15
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE2, the appropriate
@@ -779,7 +779,8 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_get_error_message(int, PCRE2_UCHAR *, PCRE2_SIZE); \
 PCRE2_EXP_DECL const uint8_t PCRE2_CALL_CONVENTION \
   *pcre2_maketables(pcre2_general_context *); \
-
+PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
+  pcre2_maketables_free(pcre2_general_context *, const uint8_t *);
 
 /* Define macros that generate width-specific names from generic versions. The
 three-level macro scheme is necessary to get the macros expanded when we want
@@ -855,6 +856,7 @@ pcre2_compile are called by application code. */
 #define pcre2_jit_stack_create                PCRE2_SUFFIX(pcre2_jit_stack_create_)
 #define pcre2_jit_stack_free                  PCRE2_SUFFIX(pcre2_jit_stack_free_)
 #define pcre2_maketables                      PCRE2_SUFFIX(pcre2_maketables_)
+#define pcre2_maketables_free                 PCRE2_SUFFIX(pcre2_maketables_free_)
 #define pcre2_match                           PCRE2_SUFFIX(pcre2_match_)
 #define pcre2_match_context_copy              PCRE2_SUFFIX(pcre2_match_context_copy_)
 #define pcre2_match_context_create            PCRE2_SUFFIX(pcre2_match_context_create_)
diff --git a/src/pcre2_auto_possess.c b/src/pcre2_auto_possess.c
index 3892c0d..5b95b9b 100644
--- a/src/pcre2_auto_possess.c
+++ b/src/pcre2_auto_possess.c
@@ -624,13 +624,13 @@ for(;;)
       case OP_ASSERTBACK_NOT:
       case OP_ONCE:
       return !entered_a_group;
-      
-      /* Non-atomic assertions - don't possessify last iterator. This needs 
+
+      /* Non-atomic assertions - don't possessify last iterator. This needs
       more thought. */
-      
+
       case OP_ASSERT_NA:
       case OP_ASSERTBACK_NA:
-      return FALSE;   
+      return FALSE;
       }
 
     /* Skip over the bracket and inspect what comes next. */
diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
index 7e44fc8..3204973 100644
--- a/src/pcre2_compile.c
+++ b/src/pcre2_compile.c
@@ -5595,16 +5595,16 @@ for (;; pptr++)
 #endif
         {
         uint32_t d;
-        
+
 #ifdef SUPPORT_UNICODE
         if (utf && c > 127) d = UCD_OTHERCASE(c); else
 #endif
           {
 #if PCRE2_CODE_UNIT_WIDTH != 8
           if (c > 255) d = c; else
-#endif 
+#endif
           d = TABLE_GET(c, cb->fcc, c);
-          }  
+          }
 
         if (c != d && pptr[2] == d)
           {
diff --git a/src/pcre2_dfa_match.c b/src/pcre2_dfa_match.c
index 2aec709..7d8ffe8 100644
--- a/src/pcre2_dfa_match.c
+++ b/src/pcre2_dfa_match.c
@@ -3678,7 +3678,7 @@ for (;;)
             pp2 = memchr(start_match, first_cu2, cu2size);
             memchr_not_found_first_cu2 = (pp2 == NULL && pp1 == NULL);
             }
- 
+
           if (pp1 == NULL)
             start_match = (pp2 == NULL)? end_subject : pp2;
           else
diff --git a/src/pcre2_error.c b/src/pcre2_error.c
index 53686ec..c61648c 100644
--- a/src/pcre2_error.c
+++ b/src/pcre2_error.c
@@ -270,7 +270,7 @@ static const unsigned char match_error_texts[] =
   "invalid syntax\0"
   /* 65 */
   "internal error - duplicate substitution match\0"
-  "PCRE2_MATCH_INVALID_UTF is not supported for DFA matching\0" 
+  "PCRE2_MATCH_INVALID_UTF is not supported for DFA matching\0"
   ;
 
 
diff --git a/src/pcre2_intmodedep.h b/src/pcre2_intmodedep.h
index 15ade47..ea3b3ec 100644
--- a/src/pcre2_intmodedep.h
+++ b/src/pcre2_intmodedep.h
@@ -853,7 +853,7 @@ typedef struct match_block {
   uint32_t match_call_count;      /* Number of times a new frame is created */
   BOOL hitend;                    /* Hit the end of the subject at some point */
   BOOL hasthen;                   /* Pattern contains (*THEN) */
-  BOOL allowemptypartial;         /* Allow empty hard partial */ 
+  BOOL allowemptypartial;         /* Allow empty hard partial */
   const uint8_t *lcc;             /* Points to lower casing table */
   const uint8_t *fcc;             /* Points to case-flipping table */
   const uint8_t *ctypes;          /* Points to table of type maps */
@@ -909,7 +909,7 @@ typedef struct dfa_match_block {
   uint32_t poptions;              /* Pattern options */
   uint32_t nltype;                /* Newline type */
   uint32_t nllen;                 /* Newline string length */
-  BOOL allowemptypartial;         /* Allow empty hard partial */ 
+  BOOL allowemptypartial;         /* Allow empty hard partial */
   PCRE2_UCHAR nl[4];              /* Newline string when fixed */
   uint16_t bsr_convention;        /* \R interpretation */
   pcre2_callout_block *cb;        /* Points to a callout block */
diff --git a/src/pcre2_printint.c b/src/pcre2_printint.c
index 87b063f..b9bab02 100644
--- a/src/pcre2_printint.c
+++ b/src/pcre2_printint.c
@@ -393,7 +393,7 @@ for(;;)
     case OP_ASSERTBACK:
     case OP_ASSERTBACK_NOT:
     case OP_ASSERT_NA:
-    case OP_ASSERTBACK_NA:  
+    case OP_ASSERTBACK_NA:
     case OP_ONCE:
     case OP_SCRIPT_RUN:
     case OP_COND:
diff --git a/src/pcre2_study.c b/src/pcre2_study.c
index 22c210b..2883868 100644
--- a/src/pcre2_study.c
+++ b/src/pcre2_study.c
@@ -1738,17 +1738,17 @@ if ((re->flags & (PCRE2_FIRSTSET|PCRE2_STARTLINE)) == 0)
         }
       }
 
-    /* Replace the start code unit bits with a first code unit, but only if it 
+    /* Replace the start code unit bits with a first code unit, but only if it
     is not the same as a required later code unit. This is because a search for
     a required code unit starts after an explicit first code unit, but at a
-    code unit found from the bitmap. Patterns such as /a*a/ don't work 
+    code unit found from the bitmap. Patterns such as /a*a/ don't work
     if both the start unit and required unit are the same. */
 
-    if (a >= 0 && 
+    if (a >= 0 &&
         (
-        (re->flags & PCRE2_LASTSET) == 0 || 
+        (re->flags & PCRE2_LASTSET) == 0 ||
           (
-          re->last_codeunit != (uint32_t)a && 
+          re->last_codeunit != (uint32_t)a &&
           (b < 0 || re->last_codeunit != (uint32_t)b)
           )
         ))