Restoring authorship annotation for Anton Samokhvalov <pg83@yandex.ru>. Commit 1 of 2.

1 files changed, 413 insertions, 413 deletions

diff --git a/contrib/libs/pcre/pcre_get.c b/contrib/libs/pcre/pcre_get.c
index 11392db08e..c6b1e97536 100644
--- a/contrib/libs/pcre/pcre_get.c
+++ b/contrib/libs/pcre/pcre_get.c
@@ -1,73 +1,73 @@
-/*************************************************
-*      Perl-Compatible Regular Expressions       *
-*************************************************/
-
-/* PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-
-                       Written by Philip Hazel
+/************************************************* 
+*      Perl-Compatible Regular Expressions       * 
+*************************************************/ 
+ 
+/* PCRE is a library of functions to support regular expressions whose syntax 
+and semantics are as close as possible to those of the Perl 5 language. 
+ 
+                       Written by Philip Hazel 
            Copyright (c) 1997-2012 University of Cambridge
-
------------------------------------------------------------------------------
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    * Neither the name of the University of Cambridge nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
------------------------------------------------------------------------------
-*/
-
-
-/* This module contains some convenience functions for extracting substrings
-from the subject string after a regex match has succeeded. The original idea
-for these functions came from Scott Wimer. */
-
-
-#ifdef HAVE_CONFIG_H
+ 
+----------------------------------------------------------------------------- 
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met: 
+ 
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer. 
+ 
+    * Redistributions in binary form must reproduce the above copyright 
+      notice, this list of conditions and the following disclaimer in the 
+      documentation and/or other materials provided with the distribution. 
+ 
+    * Neither the name of the University of Cambridge nor the names of its 
+      contributors may be used to endorse or promote products derived from 
+      this software without specific prior written permission. 
+ 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE. 
+----------------------------------------------------------------------------- 
+*/ 
+ 
+ 
+/* This module contains some convenience functions for extracting substrings 
+from the subject string after a regex match has succeeded. The original idea 
+for these functions came from Scott Wimer. */ 
+ 
+ 
+#ifdef HAVE_CONFIG_H 
 #include "pcre_config.h"
-#endif
-
-#include "pcre_internal.h"
-
-
-/*************************************************
-*           Find number for named string         *
-*************************************************/
-
-/* This function is used by the get_first_set() function below, as well
-as being generally available. It assumes that names are unique.
-
-Arguments:
-  code        the compiled regex
-  stringname  the name whose number is required
-
-Returns:      the number of the named parentheses, or a negative number
-                (PCRE_ERROR_NOSUBSTRING) if not found
-*/
-
+#endif 
+ 
+#include "pcre_internal.h" 
+ 
+ 
+/************************************************* 
+*           Find number for named string         * 
+*************************************************/ 
+ 
+/* This function is used by the get_first_set() function below, as well 
+as being generally available. It assumes that names are unique. 
+ 
+Arguments: 
+  code        the compiled regex 
+  stringname  the name whose number is required 
+ 
+Returns:      the number of the named parentheses, or a negative number 
+                (PCRE_ERROR_NOSUBSTRING) if not found 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_stringnumber(const pcre *code, const char *stringname)
+pcre_get_stringnumber(const pcre *code, const char *stringname) 
 #elif defined COMPILE_PCRE16
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre16_get_stringnumber(const pcre16 *code, PCRE_SPTR16 stringname)
@@ -75,27 +75,27 @@ pcre16_get_stringnumber(const pcre16 *code, PCRE_SPTR16 stringname)
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre32_get_stringnumber(const pcre32 *code, PCRE_SPTR32 stringname)
 #endif
-{
-int rc;
-int entrysize;
-int top, bot;
+{ 
+int rc; 
+int entrysize; 
+int top, bot; 
 pcre_uchar *nametable;
-
+ 
 #ifdef COMPILE_PCRE8
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0) 
+  return rc; 
+if (top <= 0) return PCRE_ERROR_NOSUBSTRING; 
+ 
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0) 
+  return rc; 
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0) 
+  return rc; 
 #endif
 #ifdef COMPILE_PCRE16
 if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
   return rc;
 if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
+ 
 if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
   return rc;
 if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
@@ -112,43 +112,43 @@ if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
   return rc;
 #endif
 
-bot = 0;
-while (top > bot)
-  {
-  int mid = (top + bot) / 2;
+bot = 0; 
+while (top > bot) 
+  { 
+  int mid = (top + bot) / 2; 
   pcre_uchar *entry = nametable + entrysize*mid;
   int c = STRCMP_UC_UC((pcre_uchar *)stringname,
     (pcre_uchar *)(entry + IMM2_SIZE));
   if (c == 0) return GET2(entry, 0);
-  if (c > 0) bot = mid + 1; else top = mid;
-  }
-
-return PCRE_ERROR_NOSUBSTRING;
-}
-
-
-
-/*************************************************
-*     Find (multiple) entries for named string   *
-*************************************************/
-
-/* This is used by the get_first_set() function below, as well as being
-generally available. It is used when duplicated names are permitted.
-
-Arguments:
-  code        the compiled regex
-  stringname  the name whose entries required
-  firstptr    where to put the pointer to the first entry
-  lastptr     where to put the pointer to the last entry
-
-Returns:      the length of each entry, or a negative number
-                (PCRE_ERROR_NOSUBSTRING) if not found
-*/
-
+  if (c > 0) bot = mid + 1; else top = mid; 
+  } 
+ 
+return PCRE_ERROR_NOSUBSTRING; 
+} 
+ 
+ 
+ 
+/************************************************* 
+*     Find (multiple) entries for named string   * 
+*************************************************/ 
+ 
+/* This is used by the get_first_set() function below, as well as being 
+generally available. It is used when duplicated names are permitted. 
+ 
+Arguments: 
+  code        the compiled regex 
+  stringname  the name whose entries required 
+  firstptr    where to put the pointer to the first entry 
+  lastptr     where to put the pointer to the last entry 
+ 
+Returns:      the length of each entry, or a negative number 
+                (PCRE_ERROR_NOSUBSTRING) if not found 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_stringtable_entries(const pcre *code, const char *stringname,
-  char **firstptr, char **lastptr)
+pcre_get_stringtable_entries(const pcre *code, const char *stringname, 
+  char **firstptr, char **lastptr) 
 #elif defined COMPILE_PCRE16
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre16_get_stringtable_entries(const pcre16 *code, PCRE_SPTR16 stringname,
@@ -158,27 +158,27 @@ PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre32_get_stringtable_entries(const pcre32 *code, PCRE_SPTR32 stringname,
   PCRE_UCHAR32 **firstptr, PCRE_UCHAR32 **lastptr)
 #endif
-{
-int rc;
-int entrysize;
-int top, bot;
+{ 
+int rc; 
+int entrysize; 
+int top, bot; 
 pcre_uchar *nametable, *lastentry;
-
+ 
 #ifdef COMPILE_PCRE8
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0) 
+  return rc; 
+if (top <= 0) return PCRE_ERROR_NOSUBSTRING; 
+ 
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0) 
+  return rc; 
+if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0) 
+  return rc; 
 #endif
 #ifdef COMPILE_PCRE16
 if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
   return rc;
 if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
+ 
 if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
   return rc;
 if ((rc = pcre16_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
@@ -195,33 +195,33 @@ if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
   return rc;
 #endif
 
-lastentry = nametable + entrysize * (top - 1);
-bot = 0;
-while (top > bot)
-  {
-  int mid = (top + bot) / 2;
+lastentry = nametable + entrysize * (top - 1); 
+bot = 0; 
+while (top > bot) 
+  { 
+  int mid = (top + bot) / 2; 
   pcre_uchar *entry = nametable + entrysize*mid;
   int c = STRCMP_UC_UC((pcre_uchar *)stringname,
     (pcre_uchar *)(entry + IMM2_SIZE));
-  if (c == 0)
-    {
+  if (c == 0) 
+    { 
     pcre_uchar *first = entry;
     pcre_uchar *last = entry;
-    while (first > nametable)
-      {
+    while (first > nametable) 
+      { 
       if (STRCMP_UC_UC((pcre_uchar *)stringname,
         (pcre_uchar *)(first - entrysize + IMM2_SIZE)) != 0) break;
-      first -= entrysize;
-      }
-    while (last < lastentry)
-      {
+      first -= entrysize; 
+      } 
+    while (last < lastentry) 
+      { 
       if (STRCMP_UC_UC((pcre_uchar *)stringname,
         (pcre_uchar *)(last + entrysize + IMM2_SIZE)) != 0) break;
-      last += entrysize;
-      }
+      last += entrysize; 
+      } 
 #if defined COMPILE_PCRE8
-    *firstptr = (char *)first;
-    *lastptr = (char *)last;
+    *firstptr = (char *)first; 
+    *lastptr = (char *)last; 
 #elif defined COMPILE_PCRE16
     *firstptr = (PCRE_UCHAR16 *)first;
     *lastptr = (PCRE_UCHAR16 *)last;
@@ -229,36 +229,36 @@ while (top > bot)
     *firstptr = (PCRE_UCHAR32 *)first;
     *lastptr = (PCRE_UCHAR32 *)last;
 #endif
-    return entrysize;
-    }
-  if (c > 0) bot = mid + 1; else top = mid;
-  }
-
-return PCRE_ERROR_NOSUBSTRING;
-}
-
-
-
-/*************************************************
-*    Find first set of multiple named strings    *
-*************************************************/
-
-/* This function allows for duplicate names in the table of named substrings.
-It returns the number of the first one that was set in a pattern match.
-
-Arguments:
-  code         the compiled regex
-  stringname   the name of the capturing substring
-  ovector      the vector of matched substrings
+    return entrysize; 
+    } 
+  if (c > 0) bot = mid + 1; else top = mid; 
+  } 
+ 
+return PCRE_ERROR_NOSUBSTRING; 
+} 
+ 
+ 
+ 
+/************************************************* 
+*    Find first set of multiple named strings    * 
+*************************************************/ 
+ 
+/* This function allows for duplicate names in the table of named substrings. 
+It returns the number of the first one that was set in a pattern match. 
+ 
+Arguments: 
+  code         the compiled regex 
+  stringname   the name of the capturing substring 
+  ovector      the vector of matched substrings 
   stringcount  number of captured substrings
-
-Returns:       the number of the first that is set,
-               or the number of the last one if none are set,
-               or a negative number on error
-*/
-
+ 
+Returns:       the number of the first that is set, 
+               or the number of the last one if none are set, 
+               or a negative number on error 
+*/ 
+ 
 #if defined COMPILE_PCRE8
-static int
+static int 
 get_first_set(const pcre *code, const char *stringname, int *ovector,
   int stringcount)
 #elif defined COMPILE_PCRE16
@@ -270,12 +270,12 @@ static int
 get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector,
   int stringcount)
 #endif
-{
+{ 
 const REAL_PCRE *re = (const REAL_PCRE *)code;
-int entrysize;
+int entrysize; 
 pcre_uchar *entry;
 #if defined COMPILE_PCRE8
-char *first, *last;
+char *first, *last; 
 #elif defined COMPILE_PCRE16
 PCRE_UCHAR16 *first, *last;
 #elif defined COMPILE_PCRE32
@@ -283,9 +283,9 @@ PCRE_UCHAR32 *first, *last;
 #endif
 
 #if defined COMPILE_PCRE8
-if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
-  return pcre_get_stringnumber(code, stringname);
-entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last);
+if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0) 
+  return pcre_get_stringnumber(code, stringname); 
+entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last); 
 #elif defined COMPILE_PCRE16
 if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
   return pcre16_get_stringnumber(code, stringname);
@@ -295,49 +295,49 @@ if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
   return pcre32_get_stringnumber(code, stringname);
 entrysize = pcre32_get_stringtable_entries(code, stringname, &first, &last);
 #endif
-if (entrysize <= 0) return entrysize;
+if (entrysize <= 0) return entrysize; 
 for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize)
-  {
+  { 
   int n = GET2(entry, 0);
   if (n < stringcount && ovector[n*2] >= 0) return n;
-  }
+  } 
 return GET2(entry, 0);
-}
-
-
-
-
-/*************************************************
-*      Copy captured string to given buffer      *
-*************************************************/
-
-/* This function copies a single captured substring into a given buffer.
-Note that we use memcpy() rather than strncpy() in case there are binary zeros
-in the string.
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringnumber   the number of the required substring
-  buffer         where to put the substring
-  size           the size of the buffer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) buffer too small
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
+} 
+ 
+ 
+ 
+ 
+/************************************************* 
+*      Copy captured string to given buffer      * 
+*************************************************/ 
+ 
+/* This function copies a single captured substring into a given buffer. 
+Note that we use memcpy() rather than strncpy() in case there are binary zeros 
+in the string. 
+ 
+Arguments: 
+  subject        the subject string that was matched 
+  ovector        pointer to the offsets table 
+  stringcount    the number of substrings that were captured 
+                   (i.e. the yield of the pcre_exec call, unless 
+                   that was zero, in which case it should be 1/3 
+                   of the offset table size) 
+  stringnumber   the number of the required substring 
+  buffer         where to put the substring 
+  size           the size of the buffer 
+ 
+Returns:         if successful: 
+                   the length of the copied string, not including the zero 
+                   that is put on the end; can be zero 
+                 if not successful: 
+                   PCRE_ERROR_NOMEMORY (-6) buffer too small 
+                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_copy_substring(const char *subject, int *ovector, int stringcount,
-  int stringnumber, char *buffer, int size)
+pcre_copy_substring(const char *subject, int *ovector, int stringcount, 
+  int stringnumber, char *buffer, int size) 
 #elif defined COMPILE_PCRE16
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre16_copy_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
@@ -347,48 +347,48 @@ PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre32_copy_substring(PCRE_SPTR32 subject, int *ovector, int stringcount,
   int stringnumber, PCRE_UCHAR32 *buffer, int size)
 #endif
-{
-int yield;
-if (stringnumber < 0 || stringnumber >= stringcount)
-  return PCRE_ERROR_NOSUBSTRING;
-stringnumber *= 2;
-yield = ovector[stringnumber+1] - ovector[stringnumber];
-if (size < yield + 1) return PCRE_ERROR_NOMEMORY;
+{ 
+int yield; 
+if (stringnumber < 0 || stringnumber >= stringcount) 
+  return PCRE_ERROR_NOSUBSTRING; 
+stringnumber *= 2; 
+yield = ovector[stringnumber+1] - ovector[stringnumber]; 
+if (size < yield + 1) return PCRE_ERROR_NOMEMORY; 
 memcpy(buffer, subject + ovector[stringnumber], IN_UCHARS(yield));
-buffer[yield] = 0;
-return yield;
-}
-
-
-
-/*************************************************
-*   Copy named captured string to given buffer   *
-*************************************************/
-
-/* This function copies a single captured substring into a given buffer,
-identifying it by name. If the regex permits duplicate names, the first
-substring that is set is chosen.
-
-Arguments:
-  code           the compiled regex
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringname     the name of the required substring
-  buffer         where to put the substring
-  size           the size of the buffer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) buffer too small
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
+buffer[yield] = 0; 
+return yield; 
+} 
+ 
+ 
+ 
+/************************************************* 
+*   Copy named captured string to given buffer   * 
+*************************************************/ 
+ 
+/* This function copies a single captured substring into a given buffer, 
+identifying it by name. If the regex permits duplicate names, the first 
+substring that is set is chosen. 
+ 
+Arguments: 
+  code           the compiled regex 
+  subject        the subject string that was matched 
+  ovector        pointer to the offsets table 
+  stringcount    the number of substrings that were captured 
+                   (i.e. the yield of the pcre_exec call, unless 
+                   that was zero, in which case it should be 1/3 
+                   of the offset table size) 
+  stringname     the name of the required substring 
+  buffer         where to put the substring 
+  size           the size of the buffer 
+ 
+Returns:         if successful: 
+                   the length of the copied string, not including the zero 
+                   that is put on the end; can be zero 
+                 if not successful: 
+                   PCRE_ERROR_NOMEMORY (-6) buffer too small 
+                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_copy_named_substring(const pcre *code, const char *subject,
@@ -405,45 +405,45 @@ pcre32_copy_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
   int *ovector, int stringcount, PCRE_SPTR32 stringname,
   PCRE_UCHAR32 *buffer, int size)
 #endif
-{
+{ 
 int n = get_first_set(code, stringname, ovector, stringcount);
-if (n <= 0) return n;
+if (n <= 0) return n; 
 #if defined COMPILE_PCRE8
-return pcre_copy_substring(subject, ovector, stringcount, n, buffer, size);
+return pcre_copy_substring(subject, ovector, stringcount, n, buffer, size); 
 #elif defined COMPILE_PCRE16
 return pcre16_copy_substring(subject, ovector, stringcount, n, buffer, size);
 #elif defined COMPILE_PCRE32
 return pcre32_copy_substring(subject, ovector, stringcount, n, buffer, size);
 #endif
-}
-
-
-
-/*************************************************
-*      Copy all captured strings to new store    *
-*************************************************/
-
-/* This function gets one chunk of store and builds a list of pointers and all
-of the captured substrings in it. A NULL pointer is put on the end of the list.
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  listptr        set to point to the list of pointers
-
-Returns:         if successful: 0
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) failed to get store
-*/
-
+} 
+ 
+ 
+ 
+/************************************************* 
+*      Copy all captured strings to new store    * 
+*************************************************/ 
+ 
+/* This function gets one chunk of store and builds a list of pointers and all 
+of the captured substrings in it. A NULL pointer is put on the end of the list. 
+ 
+Arguments: 
+  subject        the subject string that was matched 
+  ovector        pointer to the offsets table 
+  stringcount    the number of substrings that were captured 
+                   (i.e. the yield of the pcre_exec call, unless 
+                   that was zero, in which case it should be 1/3 
+                   of the offset table size) 
+  listptr        set to point to the list of pointers 
+ 
+Returns:         if successful: 0 
+                 if not successful: 
+                   PCRE_ERROR_NOMEMORY (-6) failed to get store 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_substring_list(const char *subject, int *ovector, int stringcount,
-  const char ***listptr)
+pcre_get_substring_list(const char *subject, int *ovector, int stringcount, 
+  const char ***listptr) 
 #elif defined COMPILE_PCRE16
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre16_get_substring_list(PCRE_SPTR16 subject, int *ovector, int stringcount,
@@ -453,61 +453,61 @@ PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre32_get_substring_list(PCRE_SPTR32 subject, int *ovector, int stringcount,
   PCRE_SPTR32 **listptr)
 #endif
-{
-int i;
+{ 
+int i; 
 int size = sizeof(pcre_uchar *);
-int double_count = stringcount * 2;
+int double_count = stringcount * 2; 
 pcre_uchar **stringlist;
 pcre_uchar *p;
-
-for (i = 0; i < double_count; i += 2)
+ 
+for (i = 0; i < double_count; i += 2) 
   {
   size += sizeof(pcre_uchar *) + IN_UCHARS(1);
   if (ovector[i+1] > ovector[i]) size += IN_UCHARS(ovector[i+1] - ovector[i]);
   }
-
+ 
 stringlist = (pcre_uchar **)(PUBL(malloc))(size);
-if (stringlist == NULL) return PCRE_ERROR_NOMEMORY;
-
+if (stringlist == NULL) return PCRE_ERROR_NOMEMORY; 
+ 
 #if defined COMPILE_PCRE8
-*listptr = (const char **)stringlist;
+*listptr = (const char **)stringlist; 
 #elif defined COMPILE_PCRE16
 *listptr = (PCRE_SPTR16 *)stringlist;
 #elif defined COMPILE_PCRE32
 *listptr = (PCRE_SPTR32 *)stringlist;
 #endif
 p = (pcre_uchar *)(stringlist + stringcount + 1);
-
-for (i = 0; i < double_count; i += 2)
-  {
+ 
+for (i = 0; i < double_count; i += 2) 
+  { 
   int len = (ovector[i+1] > ovector[i])? (ovector[i+1] - ovector[i]) : 0;
   memcpy(p, subject + ovector[i], IN_UCHARS(len));
-  *stringlist++ = p;
-  p += len;
-  *p++ = 0;
-  }
-
-*stringlist = NULL;
-return 0;
-}
-
-
-
-/*************************************************
-*   Free store obtained by get_substring_list    *
-*************************************************/
-
-/* This function exists for the benefit of people calling PCRE from non-C
+  *stringlist++ = p; 
+  p += len; 
+  *p++ = 0; 
+  } 
+ 
+*stringlist = NULL; 
+return 0; 
+} 
+ 
+ 
+ 
+/************************************************* 
+*   Free store obtained by get_substring_list    * 
+*************************************************/ 
+ 
+/* This function exists for the benefit of people calling PCRE from non-C 
 programs that can call its functions, but not free() or (PUBL(free))()
 directly.
-
-Argument:   the result of a previous pcre_get_substring_list()
-Returns:    nothing
-*/
-
+ 
+Argument:   the result of a previous pcre_get_substring_list() 
+Returns:    nothing 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre_free_substring_list(const char **pointer)
+pcre_free_substring_list(const char **pointer) 
 #elif defined COMPILE_PCRE16
 PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
 pcre16_free_substring_list(PCRE_SPTR16 *pointer)
@@ -515,41 +515,41 @@ pcre16_free_substring_list(PCRE_SPTR16 *pointer)
 PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
 pcre32_free_substring_list(PCRE_SPTR32 *pointer)
 #endif
-{
+{ 
 (PUBL(free))((void *)pointer);
-}
-
-
-
-/*************************************************
-*      Copy captured string to new store         *
-*************************************************/
-
-/* This function copies a single captured substring into a piece of new
-store
-
-Arguments:
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringnumber   the number of the required substring
-  stringptr      where to put a pointer to the substring
-
-Returns:         if successful:
-                   the length of the string, not including the zero that
-                   is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) failed to get store
-                   PCRE_ERROR_NOSUBSTRING (-7) substring not present
-*/
-
+} 
+ 
+ 
+ 
+/************************************************* 
+*      Copy captured string to new store         * 
+*************************************************/ 
+ 
+/* This function copies a single captured substring into a piece of new 
+store 
+ 
+Arguments: 
+  subject        the subject string that was matched 
+  ovector        pointer to the offsets table 
+  stringcount    the number of substrings that were captured 
+                   (i.e. the yield of the pcre_exec call, unless 
+                   that was zero, in which case it should be 1/3 
+                   of the offset table size) 
+  stringnumber   the number of the required substring 
+  stringptr      where to put a pointer to the substring 
+ 
+Returns:         if successful: 
+                   the length of the string, not including the zero that 
+                   is put on the end; can be zero 
+                 if not successful: 
+                   PCRE_ERROR_NOMEMORY (-6) failed to get store 
+                   PCRE_ERROR_NOSUBSTRING (-7) substring not present 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre_get_substring(const char *subject, int *ovector, int stringcount,
-  int stringnumber, const char **stringptr)
+pcre_get_substring(const char *subject, int *ovector, int stringcount, 
+  int stringnumber, const char **stringptr) 
 #elif defined COMPILE_PCRE16
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre16_get_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
@@ -559,17 +559,17 @@ PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre32_get_substring(PCRE_SPTR32 subject, int *ovector, int stringcount,
   int stringnumber, PCRE_SPTR32 *stringptr)
 #endif
-{
-int yield;
+{ 
+int yield; 
 pcre_uchar *substring;
-if (stringnumber < 0 || stringnumber >= stringcount)
-  return PCRE_ERROR_NOSUBSTRING;
-stringnumber *= 2;
-yield = ovector[stringnumber+1] - ovector[stringnumber];
+if (stringnumber < 0 || stringnumber >= stringcount) 
+  return PCRE_ERROR_NOSUBSTRING; 
+stringnumber *= 2; 
+yield = ovector[stringnumber+1] - ovector[stringnumber]; 
 substring = (pcre_uchar *)(PUBL(malloc))(IN_UCHARS(yield + 1));
-if (substring == NULL) return PCRE_ERROR_NOMEMORY;
+if (substring == NULL) return PCRE_ERROR_NOMEMORY; 
 memcpy(substring, subject + ovector[stringnumber], IN_UCHARS(yield));
-substring[yield] = 0;
+substring[yield] = 0; 
 #if defined COMPILE_PCRE8
 *stringptr = (const char *)substring;
 #elif defined COMPILE_PCRE16
@@ -577,38 +577,38 @@ substring[yield] = 0;
 #elif defined COMPILE_PCRE32
 *stringptr = (PCRE_SPTR32)substring;
 #endif
-return yield;
-}
-
-
-
-/*************************************************
-*   Copy named captured string to new store      *
-*************************************************/
-
-/* This function copies a single captured substring, identified by name, into
-new store. If the regex permits duplicate names, the first substring that is
-set is chosen.
-
-Arguments:
-  code           the compiled regex
-  subject        the subject string that was matched
-  ovector        pointer to the offsets table
-  stringcount    the number of substrings that were captured
-                   (i.e. the yield of the pcre_exec call, unless
-                   that was zero, in which case it should be 1/3
-                   of the offset table size)
-  stringname     the name of the required substring
-  stringptr      where to put the pointer
-
-Returns:         if successful:
-                   the length of the copied string, not including the zero
-                   that is put on the end; can be zero
-                 if not successful:
-                   PCRE_ERROR_NOMEMORY (-6) couldn't get memory
-                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
-*/
-
+return yield; 
+} 
+ 
+ 
+ 
+/************************************************* 
+*   Copy named captured string to new store      * 
+*************************************************/ 
+ 
+/* This function copies a single captured substring, identified by name, into 
+new store. If the regex permits duplicate names, the first substring that is 
+set is chosen. 
+ 
+Arguments: 
+  code           the compiled regex 
+  subject        the subject string that was matched 
+  ovector        pointer to the offsets table 
+  stringcount    the number of substrings that were captured 
+                   (i.e. the yield of the pcre_exec call, unless 
+                   that was zero, in which case it should be 1/3 
+                   of the offset table size) 
+  stringname     the name of the required substring 
+  stringptr      where to put the pointer 
+ 
+Returns:         if successful: 
+                   the length of the copied string, not including the zero 
+                   that is put on the end; can be zero 
+                 if not successful: 
+                   PCRE_ERROR_NOMEMORY (-6) couldn't get memory 
+                   PCRE_ERROR_NOSUBSTRING (-7) no such captured substring 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
 pcre_get_named_substring(const pcre *code, const char *subject,
@@ -625,36 +625,36 @@ pcre32_get_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
   int *ovector, int stringcount, PCRE_SPTR32 stringname,
   PCRE_SPTR32 *stringptr)
 #endif
-{
+{ 
 int n = get_first_set(code, stringname, ovector, stringcount);
-if (n <= 0) return n;
+if (n <= 0) return n; 
 #if defined COMPILE_PCRE8
-return pcre_get_substring(subject, ovector, stringcount, n, stringptr);
+return pcre_get_substring(subject, ovector, stringcount, n, stringptr); 
 #elif defined COMPILE_PCRE16
 return pcre16_get_substring(subject, ovector, stringcount, n, stringptr);
 #elif defined COMPILE_PCRE32
 return pcre32_get_substring(subject, ovector, stringcount, n, stringptr);
 #endif
-}
-
-
-
-
-/*************************************************
-*       Free store obtained by get_substring     *
-*************************************************/
-
-/* This function exists for the benefit of people calling PCRE from non-C
+} 
+ 
+ 
+ 
+ 
+/************************************************* 
+*       Free store obtained by get_substring     * 
+*************************************************/ 
+ 
+/* This function exists for the benefit of people calling PCRE from non-C 
 programs that can call its functions, but not free() or (PUBL(free))()
 directly.
-
-Argument:   the result of a previous pcre_get_substring()
-Returns:    nothing
-*/
-
+ 
+Argument:   the result of a previous pcre_get_substring() 
+Returns:    nothing 
+*/ 
+ 
 #if defined COMPILE_PCRE8
 PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre_free_substring(const char *pointer)
+pcre_free_substring(const char *pointer) 
 #elif defined COMPILE_PCRE16
 PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
 pcre16_free_substring(PCRE_SPTR16 pointer)
@@ -662,8 +662,8 @@ pcre16_free_substring(PCRE_SPTR16 pointer)
 PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
 pcre32_free_substring(PCRE_SPTR32 pointer)
 #endif
-{
+{ 
 (PUBL(free))((void *)pointer);
-}
-
-/* End of pcre_get.c */
+} 
+ 
+/* End of pcre_get.c */