File tidies, version updates, etc. for 10.21-RC1

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

11 files changed, 24 insertions, 24 deletions

diff --git a/src/pcre2.h b/src/pcre2.h
index 3f8f8e0..e5848cf 100644
--- a/src/pcre2.h
+++ b/src/pcre2.h
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define PCRE2_MAJOR          10
 #define PCRE2_MINOR          21
 #define PCRE2_PRERELEASE     -RC1
-#define PCRE2_DATE           2015-07-06
+#define PCRE2_DATE           2015-12-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
diff --git a/src/pcre2_dfa_match.c b/src/pcre2_dfa_match.c
index 5350f89..34c479b 100644
--- a/src/pcre2_dfa_match.c
+++ b/src/pcre2_dfa_match.c
@@ -466,7 +466,7 @@ if (*first_op == OP_REVERSE)
   /* In byte-mode we can do this quickly. */
 
     {
-    size_t current_offset = (size_t)(current_subject - start_subject); 
+    size_t current_offset = (size_t)(current_subject - start_subject);
     gone_back = (current_offset < max_back)? current_offset : max_back;
     current_subject -= gone_back;
     }
diff --git a/src/pcre2_error.c b/src/pcre2_error.c
index a90662b..ea651c8 100644
--- a/src/pcre2_error.c
+++ b/src/pcre2_error.c
@@ -251,7 +251,7 @@ static const char match_error_texts[] =
   "bad substitution in replacement string\0"
   /* 60 */
   "match with end before start is not supported\0"
-  "too many replacements (more than INT_MAX)\0" 
+  "too many replacements (more than INT_MAX)\0"
   ;
 
 
diff --git a/src/pcre2_intmodedep.h b/src/pcre2_intmodedep.h
index 3ae1b12..b2f4092 100644
--- a/src/pcre2_intmodedep.h
+++ b/src/pcre2_intmodedep.h
@@ -562,7 +562,7 @@ typedef struct pcre2_real_compile_context {
   int (*stack_guard)(uint32_t, void *);
   void *stack_guard_data;
   const uint8_t *tables;
-  PCRE2_SIZE max_pattern_length; 
+  PCRE2_SIZE max_pattern_length;
   uint16_t bsr_convention;
   uint16_t newline_convention;
   uint32_t parens_nest_limit;
@@ -581,7 +581,7 @@ typedef struct pcre2_real_match_context {
 #endif
   int    (*callout)(pcre2_callout_block *, void *);
   void    *callout_data;
-  PCRE2_SIZE offset_limit; 
+  PCRE2_SIZE offset_limit;
   uint32_t match_limit;
   uint32_t recursion_limit;
 } pcre2_real_match_context;
@@ -592,7 +592,7 @@ copying the size from possibly unaligned memory into a variable of the same
 type. Use a macro rather than a typedef to avoid compiler warnings when this
 file is included multiple times by pcre2test. LOOKBEHIND_MAX specifies the
 largest lookbehind that is supported. (OP_REVERSE in a pattern has a 16-bit
-argument in 8-bit and 16-bit modes, so we need no more than a 16-bit field 
+argument in 8-bit and 16-bit modes, so we need no more than a 16-bit field
 here.) */
 
 #undef  CODE_BLOCKSIZE_TYPE
@@ -660,7 +660,7 @@ typedef struct recurse_check {
 typedef struct recurse_cache {
   PCRE2_SPTR group;
   int recno;
-} recurse_cache;    
+} recurse_cache;
 
 /* Structure for maintaining a chain of pointers to the currently incomplete
 branches, for testing for left recursion while compiling. */
@@ -693,7 +693,7 @@ typedef struct compile_block {
   PCRE2_SPTR start_code;           /* The start of the compiled code */
   PCRE2_SPTR start_pattern;        /* The start of the pattern */
   PCRE2_SPTR end_pattern;          /* The end of the pattern */
-  PCRE2_SPTR nestptr[2];           /* Pointer(s) saved for string substitution */ 
+  PCRE2_SPTR nestptr[2];           /* Pointer(s) saved for string substitution */
   PCRE2_UCHAR *name_table;         /* The name/number table */
   size_t workspace_size;           /* Size of workspace */
   uint16_t names_found;            /* Number of entries so far */
@@ -717,7 +717,7 @@ typedef struct compile_block {
   int  req_varyopt;                /* "After variable item" flag for reqbyte */
   BOOL had_accept;                 /* (*ACCEPT) encountered */
   BOOL had_pruneorskip;            /* (*PRUNE) or (*SKIP) encountered */
-  BOOL had_recurse;                /* Had a recursion or subroutine call */ 
+  BOOL had_recurse;                /* Had a recursion or subroutine call */
   BOOL check_lookbehind;           /* Lookbehinds need later checking */
   BOOL dupnames;                   /* Duplicate names exist */
   BOOL iscondassert;               /* Next assert is a condition */
diff --git a/src/pcre2_match.c b/src/pcre2_match.c
index 3740982..011ef38 100644
--- a/src/pcre2_match.c
+++ b/src/pcre2_match.c
@@ -2409,7 +2409,7 @@ for (;;)
     break;
 
     /* Match a single code unit, even in UTF-8 mode. This opcode really does
-    match any code unit, even newline. (It really should be called ANYCODEUNIT, 
+    match any code unit, even newline. (It really should be called ANYCODEUNIT,
     of course - the byte name is from pre-16 bit days.) */
 
     case OP_ANYBYTE:
diff --git a/src/pcre2_pattern_info.c b/src/pcre2_pattern_info.c
index 28c6869..6a1ae56 100644
--- a/src/pcre2_pattern_info.c
+++ b/src/pcre2_pattern_info.c
@@ -77,7 +77,7 @@ if (where == NULL)   /* Requests field length */
     case PCRE2_INFO_CAPTURECOUNT:
     case PCRE2_INFO_FIRSTCODETYPE:
     case PCRE2_INFO_FIRSTCODEUNIT:
-    case PCRE2_INFO_HASBACKSLASHC: 
+    case PCRE2_INFO_HASBACKSLASHC:
     case PCRE2_INFO_HASCRORLF:
     case PCRE2_INFO_JCHANGED:
     case PCRE2_INFO_LASTCODETYPE:
diff --git a/src/pcre2_printint.c b/src/pcre2_printint.c
index 6d4fe60..a6c2f6a 100644
--- a/src/pcre2_printint.c
+++ b/src/pcre2_printint.c
@@ -190,13 +190,13 @@ return 0;
 *************************************************/
 
 /* These take no account of UTF as they always print each individual code unit.
-The string is zero-terminated for print_custring(); the length is given for 
+The string is zero-terminated for print_custring(); the length is given for
 print_custring_bylen().
 
 Arguments:
   f          file to write to
   ptr        point to the string
-  len        length for print_custring_bylen() 
+  len        length for print_custring_bylen()
 
 Returns:     nothing
 */
diff --git a/src/pcre2_study.c b/src/pcre2_study.c
index 3c61012..a30ade6 100644
--- a/src/pcre2_study.c
+++ b/src/pcre2_study.c
@@ -1546,7 +1546,7 @@ if ((re->overall_options & PCRE2_ANCHORED) == 0 &&
   if (rc == SSB_DONE) re->flags |= PCRE2_FIRSTMAPSET;
   }
 
-/* Find the minimum length of subject string. If it can match an empty string, 
+/* Find the minimum length of subject string. If it can match an empty string,
 the minimum length is already known. */
 
 if ((re->flags & PCRE2_MATCH_EMPTY) == 0)
@@ -1555,19 +1555,19 @@ if ((re->flags & PCRE2_MATCH_EMPTY) == 0)
     {
     case -1:  /* \C in UTF mode or (*ACCEPT) or over-complex regex */
     break;    /* Leave minlength unchanged (will be zero) */
-  
+
     case -2:
     return 2; /* missing capturing bracket */
-  
+
     case -3:
     return 3; /* unrecognized opcode */
-  
+
     default:
     if (min > UINT16_MAX) min = UINT16_MAX;
     re->minlength = min;
     break;
     }
-  }   
+  }
 
 return 0;
 }
diff --git a/src/pcre2_valid_utf.c b/src/pcre2_valid_utf.c
index 94e97d7..5b3990e 100644
--- a/src/pcre2_valid_utf.c
+++ b/src/pcre2_valid_utf.c
@@ -136,7 +136,7 @@ for (p = string; length > 0; p++)
   register uint32_t ab, d;
 
   c = *p;
-  length--; 
+  length--;
 
   if (c < 128) continue;                /* ASCII character */
 
@@ -329,7 +329,7 @@ PCRE2_ERROR_UTF16_ERR3  Isolated low surrogate
 for (p = string; length > 0; p++)
   {
   c = *p;
-  length--; 
+  length--;
 
   if ((c & 0xf800) != 0xd800)
     {
diff --git a/src/pcre2posix.c b/src/pcre2posix.c
index cd6e664..02a5b1f 100644
--- a/src/pcre2posix.c
+++ b/src/pcre2posix.c
@@ -285,7 +285,7 @@ start location rather than being passed as a PCRE2 "starting offset". */
 
 if ((eflags & REG_STARTEND) != 0)
   {
-  if (pmatch == NULL) return REG_INVARG; 
+  if (pmatch == NULL) return REG_INVARG;
   so = pmatch[0].rm_so;
   eo = pmatch[0].rm_eo;
   }
diff --git a/src/pcre2test.c b/src/pcre2test.c
index 4f17a43..6343ff9 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
@@ -6033,14 +6033,14 @@ if (dat_datctl.replacement[0] != 0)
 
   if (rc < 0)
     {
-    PCRE2_SIZE msize; 
+    PCRE2_SIZE msize;
     fprintf(outfile, "Failed: error %d", rc);
     if (rc != PCRE2_ERROR_NOMEMORY && nsize != PCRE2_UNSET)
       fprintf(outfile, " at offset %ld in replacement", (long int)nsize);
     fprintf(outfile, ": ");
     PCRE2_GET_ERROR_MESSAGE(msize, rc, pbuffer);
     PCHARSV(CASTVAR(void *, pbuffer), 0, msize, FALSE, outfile);
-    if (rc == PCRE2_ERROR_NOMEMORY && 
+    if (rc == PCRE2_ERROR_NOMEMORY &&
         (xoptions & PCRE2_SUBSTITUTE_OVERFLOW_LENGTH) != 0)
       fprintf(outfile, ": %ld code units are needed", (long int)nsize);
     }
@@ -6405,7 +6405,7 @@ else for (gmatched = 0;; gmatched++)
          TESTFLD(match_data, mark, !=, NULL))
       {
       fprintf(outfile, ", mark=");
-      PCHARS(rubriclength, CASTFLD(void *, match_data, mark), 0, -1, utf, 
+      PCHARS(rubriclength, CASTFLD(void *, match_data, mark), 0, -1, utf,
         outfile);
       rubriclength += 7;
       }