Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 1 of 2.

1 files changed, 258 insertions, 258 deletions

diff --git a/contrib/libs/pcre/pcre_get.c b/contrib/libs/pcre/pcre_get.c
index 11392db08e..35e4bf4d3a 100644
--- a/contrib/libs/pcre/pcre_get.c
+++ b/contrib/libs/pcre/pcre_get.c
@@ -6,7 +6,7 @@
 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
+           Copyright (c) 1997-2012 University of Cambridge 
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,7 @@ for these functions came from Scott Wimer. */
 
 
 #ifdef HAVE_CONFIG_H
-#include "pcre_config.h"
+#include "pcre_config.h" 
 #endif
 
 #include "pcre_internal.h"
@@ -65,23 +65,23 @@ 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
+#if defined COMPILE_PCRE8 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
 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)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_stringnumber(const pcre32 *code, PCRE_SPTR32 stringname)
-#endif
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre16_get_stringnumber(const pcre16 *code, PCRE_SPTR16 stringname) 
+#elif defined COMPILE_PCRE32 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre32_get_stringnumber(const pcre32 *code, PCRE_SPTR32 stringname) 
+#endif 
 {
 int rc;
 int entrysize;
 int top, bot;
-pcre_uchar *nametable;
+pcre_uchar *nametable; 
 
-#ifdef COMPILE_PCRE8
+#ifdef COMPILE_PCRE8 
 if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
   return rc;
 if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
@@ -90,36 +90,36 @@ 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)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE32
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-
+#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) 
+  return rc; 
+#endif 
+#ifdef COMPILE_PCRE32 
+if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0) 
+  return rc; 
+if (top <= 0) return PCRE_ERROR_NOSUBSTRING; 
+ 
+if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0) 
+  return rc; 
+if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0) 
+  return rc; 
+#endif 
+ 
 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);
+  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;
   }
 
@@ -145,26 +145,26 @@ 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
+#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)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_stringtable_entries(const pcre16 *code, PCRE_SPTR16 stringname,
-  PCRE_UCHAR16 **firstptr, PCRE_UCHAR16 **lastptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_stringtable_entries(const pcre32 *code, PCRE_SPTR32 stringname,
-  PCRE_UCHAR32 **firstptr, PCRE_UCHAR32 **lastptr)
-#endif
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre16_get_stringtable_entries(const pcre16 *code, PCRE_SPTR16 stringname, 
+  PCRE_UCHAR16 **firstptr, PCRE_UCHAR16 **lastptr) 
+#elif defined COMPILE_PCRE32 
+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;
-pcre_uchar *nametable, *lastentry;
+pcre_uchar *nametable, *lastentry; 
 
-#ifdef COMPILE_PCRE8
+#ifdef COMPILE_PCRE8 
 if ((rc = pcre_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
   return rc;
 if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
@@ -173,62 +173,62 @@ 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)
-  return rc;
-#endif
-#ifdef COMPILE_PCRE32
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0)
-  return rc;
-if (top <= 0) return PCRE_ERROR_NOSUBSTRING;
-
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0)
-  return rc;
-if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMETABLE, &nametable)) != 0)
-  return rc;
-#endif
-
+#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) 
+  return rc; 
+#endif 
+#ifdef COMPILE_PCRE32 
+if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMECOUNT, &top)) != 0) 
+  return rc; 
+if (top <= 0) return PCRE_ERROR_NOSUBSTRING; 
+ 
+if ((rc = pcre32_fullinfo(code, NULL, PCRE_INFO_NAMEENTRYSIZE, &entrysize)) != 0) 
+  return rc; 
+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;
-  pcre_uchar *entry = nametable + entrysize*mid;
-  int c = STRCMP_UC_UC((pcre_uchar *)stringname,
-    (pcre_uchar *)(entry + IMM2_SIZE));
+  pcre_uchar *entry = nametable + entrysize*mid; 
+  int c = STRCMP_UC_UC((pcre_uchar *)stringname, 
+    (pcre_uchar *)(entry + IMM2_SIZE)); 
   if (c == 0)
     {
-    pcre_uchar *first = entry;
-    pcre_uchar *last = entry;
+    pcre_uchar *first = entry; 
+    pcre_uchar *last = entry; 
     while (first > nametable)
       {
-      if (STRCMP_UC_UC((pcre_uchar *)stringname,
-        (pcre_uchar *)(first - entrysize + IMM2_SIZE)) != 0) break;
+      if (STRCMP_UC_UC((pcre_uchar *)stringname, 
+        (pcre_uchar *)(first - entrysize + IMM2_SIZE)) != 0) break; 
       first -= entrysize;
       }
     while (last < lastentry)
       {
-      if (STRCMP_UC_UC((pcre_uchar *)stringname,
-        (pcre_uchar *)(last + entrysize + IMM2_SIZE)) != 0) break;
+      if (STRCMP_UC_UC((pcre_uchar *)stringname, 
+        (pcre_uchar *)(last + entrysize + IMM2_SIZE)) != 0) break; 
       last += entrysize;
       }
-#if defined COMPILE_PCRE8
+#if defined COMPILE_PCRE8 
     *firstptr = (char *)first;
     *lastptr = (char *)last;
-#elif defined COMPILE_PCRE16
-    *firstptr = (PCRE_UCHAR16 *)first;
-    *lastptr = (PCRE_UCHAR16 *)last;
-#elif defined COMPILE_PCRE32
-    *firstptr = (PCRE_UCHAR32 *)first;
-    *lastptr = (PCRE_UCHAR32 *)last;
-#endif
+#elif defined COMPILE_PCRE16 
+    *firstptr = (PCRE_UCHAR16 *)first; 
+    *lastptr = (PCRE_UCHAR16 *)last; 
+#elif defined COMPILE_PCRE32 
+    *firstptr = (PCRE_UCHAR32 *)first; 
+    *lastptr = (PCRE_UCHAR32 *)last; 
+#endif 
     return entrysize;
     }
   if (c > 0) bot = mid + 1; else top = mid;
@@ -250,58 +250,58 @@ Arguments:
   code         the compiled regex
   stringname   the name of the capturing substring
   ovector      the vector of matched substrings
-  stringcount  number of captured 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
 */
 
-#if defined COMPILE_PCRE8
-static int
-get_first_set(const pcre *code, const char *stringname, int *ovector,
-  int stringcount)
-#elif defined COMPILE_PCRE16
-static int
-get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector,
-  int stringcount)
-#elif defined COMPILE_PCRE32
+#if defined COMPILE_PCRE8 
 static int
-get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector,
-  int stringcount)
-#endif
+get_first_set(const pcre *code, const char *stringname, int *ovector, 
+  int stringcount) 
+#elif defined COMPILE_PCRE16 
+static int 
+get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector, 
+  int stringcount) 
+#elif defined COMPILE_PCRE32 
+static int 
+get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector, 
+  int stringcount) 
+#endif 
 {
-const REAL_PCRE *re = (const REAL_PCRE *)code;
+const REAL_PCRE *re = (const REAL_PCRE *)code; 
 int entrysize;
-pcre_uchar *entry;
-#if defined COMPILE_PCRE8
+pcre_uchar *entry; 
+#if defined COMPILE_PCRE8 
 char *first, *last;
-#elif defined COMPILE_PCRE16
-PCRE_UCHAR16 *first, *last;
-#elif defined COMPILE_PCRE32
-PCRE_UCHAR32 *first, *last;
-#endif
-
-#if defined COMPILE_PCRE8
+#elif defined COMPILE_PCRE16 
+PCRE_UCHAR16 *first, *last; 
+#elif defined COMPILE_PCRE32 
+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);
-#elif defined COMPILE_PCRE16
-if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
-  return pcre16_get_stringnumber(code, stringname);
-entrysize = pcre16_get_stringtable_entries(code, stringname, &first, &last);
-#elif defined COMPILE_PCRE32
-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
+#elif defined COMPILE_PCRE16 
+if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0) 
+  return pcre16_get_stringnumber(code, stringname); 
+entrysize = pcre16_get_stringtable_entries(code, stringname, &first, &last); 
+#elif defined COMPILE_PCRE32 
+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;
-for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += 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;
+  int n = GET2(entry, 0); 
+  if (n < stringcount && ovector[n*2] >= 0) return n; 
   }
-return GET2(entry, 0);
+return GET2(entry, 0); 
 }
 
 
@@ -334,19 +334,19 @@ Returns:         if successful:
                    PCRE_ERROR_NOSUBSTRING (-7) no such captured substring
 */
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
+#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)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_copy_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_UCHAR16 *buffer, int size)
-#elif defined COMPILE_PCRE32
-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
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre16_copy_substring(PCRE_SPTR16 subject, int *ovector, int stringcount, 
+  int stringnumber, PCRE_UCHAR16 *buffer, int size) 
+#elif defined COMPILE_PCRE32 
+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)
@@ -354,7 +354,7 @@ if (stringnumber < 0 || stringnumber >= stringcount)
 stringnumber *= 2;
 yield = ovector[stringnumber+1] - ovector[stringnumber];
 if (size < yield + 1) return PCRE_ERROR_NOMEMORY;
-memcpy(buffer, subject + ovector[stringnumber], IN_UCHARS(yield));
+memcpy(buffer, subject + ovector[stringnumber], IN_UCHARS(yield)); 
 buffer[yield] = 0;
 return yield;
 }
@@ -389,32 +389,32 @@ Returns:         if successful:
                    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,
-  int *ovector, int stringcount, const char *stringname,
-  char *buffer, int size)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_copy_named_substring(const pcre16 *code, PCRE_SPTR16 subject,
-  int *ovector, int stringcount, PCRE_SPTR16 stringname,
-  PCRE_UCHAR16 *buffer, int size)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_copy_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
-  int *ovector, int stringcount, PCRE_SPTR32 stringname,
-  PCRE_UCHAR32 *buffer, int size)
-#endif
+#if defined COMPILE_PCRE8 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre_copy_named_substring(const pcre *code, const char *subject, 
+  int *ovector, int stringcount, const char *stringname, 
+  char *buffer, int size) 
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre16_copy_named_substring(const pcre16 *code, PCRE_SPTR16 subject, 
+  int *ovector, int stringcount, PCRE_SPTR16 stringname, 
+  PCRE_UCHAR16 *buffer, int size) 
+#elif defined COMPILE_PCRE32 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+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);
+int n = get_first_set(code, stringname, ovector, stringcount); 
 if (n <= 0) return n;
-#if defined COMPILE_PCRE8
+#if defined COMPILE_PCRE8 
 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
+#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 
 }
 
 
@@ -440,48 +440,48 @@ Returns:         if successful: 0
                    PCRE_ERROR_NOMEMORY (-6) failed to get store
 */
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
+#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)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_substring_list(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  PCRE_SPTR16 **listptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_substring_list(PCRE_SPTR32 subject, int *ovector, int stringcount,
-  PCRE_SPTR32 **listptr)
-#endif
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre16_get_substring_list(PCRE_SPTR16 subject, int *ovector, int stringcount, 
+  PCRE_SPTR16 **listptr) 
+#elif defined COMPILE_PCRE32 
+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 size = sizeof(pcre_uchar *);
+int size = sizeof(pcre_uchar *); 
 int double_count = stringcount * 2;
-pcre_uchar **stringlist;
-pcre_uchar *p;
+pcre_uchar **stringlist; 
+pcre_uchar *p; 
 
 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]);
-  }
+  { 
+  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);
+stringlist = (pcre_uchar **)(PUBL(malloc))(size); 
 if (stringlist == NULL) return PCRE_ERROR_NOMEMORY;
 
-#if defined COMPILE_PCRE8
+#if defined COMPILE_PCRE8 
 *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);
+#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)
   {
-  int len = (ovector[i+1] > ovector[i])? (ovector[i+1] - ovector[i]) : 0;
-  memcpy(p, subject + ovector[i], IN_UCHARS(len));
+  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;
@@ -498,25 +498,25 @@ return 0;
 *************************************************/
 
 /* 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.
+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
 */
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
+#if defined COMPILE_PCRE8 
+PCRE_EXP_DEFN void PCRE_CALL_CONVENTION 
 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)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre32_free_substring_list(PCRE_SPTR32 *pointer)
-#endif
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN void PCRE_CALL_CONVENTION 
+pcre16_free_substring_list(PCRE_SPTR16 *pointer) 
+#elif defined COMPILE_PCRE32 
+PCRE_EXP_DEFN void PCRE_CALL_CONVENTION 
+pcre32_free_substring_list(PCRE_SPTR32 *pointer) 
+#endif 
 {
-(PUBL(free))((void *)pointer);
+(PUBL(free))((void *)pointer); 
 }
 
 
@@ -546,37 +546,37 @@ Returns:         if successful:
                    PCRE_ERROR_NOSUBSTRING (-7) substring not present
 */
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
+#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)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_substring(PCRE_SPTR16 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_SPTR16 *stringptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_substring(PCRE_SPTR32 subject, int *ovector, int stringcount,
-  int stringnumber, PCRE_SPTR32 *stringptr)
-#endif
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre16_get_substring(PCRE_SPTR16 subject, int *ovector, int stringcount, 
+  int stringnumber, PCRE_SPTR16 *stringptr) 
+#elif defined COMPILE_PCRE32 
+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;
-pcre_uchar *substring;
+pcre_uchar *substring; 
 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));
+substring = (pcre_uchar *)(PUBL(malloc))(IN_UCHARS(yield + 1)); 
 if (substring == NULL) return PCRE_ERROR_NOMEMORY;
-memcpy(substring, subject + ovector[stringnumber], IN_UCHARS(yield));
+memcpy(substring, subject + ovector[stringnumber], IN_UCHARS(yield)); 
 substring[yield] = 0;
-#if defined COMPILE_PCRE8
-*stringptr = (const char *)substring;
-#elif defined COMPILE_PCRE16
-*stringptr = (PCRE_SPTR16)substring;
-#elif defined COMPILE_PCRE32
-*stringptr = (PCRE_SPTR32)substring;
-#endif
+#if defined COMPILE_PCRE8 
+*stringptr = (const char *)substring; 
+#elif defined COMPILE_PCRE16 
+*stringptr = (PCRE_SPTR16)substring; 
+#elif defined COMPILE_PCRE32 
+*stringptr = (PCRE_SPTR32)substring; 
+#endif 
 return yield;
 }
 
@@ -609,32 +609,32 @@ Returns:         if successful:
                    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,
-  int *ovector, int stringcount, const char *stringname,
-  const char **stringptr)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre16_get_named_substring(const pcre16 *code, PCRE_SPTR16 subject,
-  int *ovector, int stringcount, PCRE_SPTR16 stringname,
-  PCRE_SPTR16 *stringptr)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN int PCRE_CALL_CONVENTION
-pcre32_get_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
-  int *ovector, int stringcount, PCRE_SPTR32 stringname,
-  PCRE_SPTR32 *stringptr)
-#endif
+#if defined COMPILE_PCRE8 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre_get_named_substring(const pcre *code, const char *subject, 
+  int *ovector, int stringcount, const char *stringname, 
+  const char **stringptr) 
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+pcre16_get_named_substring(const pcre16 *code, PCRE_SPTR16 subject, 
+  int *ovector, int stringcount, PCRE_SPTR16 stringname, 
+  PCRE_SPTR16 *stringptr) 
+#elif defined COMPILE_PCRE32 
+PCRE_EXP_DEFN int PCRE_CALL_CONVENTION 
+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);
+int n = get_first_set(code, stringname, ovector, stringcount); 
 if (n <= 0) return n;
-#if defined COMPILE_PCRE8
+#if defined COMPILE_PCRE8 
 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
+#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 
 }
 
 
@@ -645,25 +645,25 @@ return pcre32_get_substring(subject, ovector, stringcount, n, stringptr);
 *************************************************/
 
 /* 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.
+programs that can call its functions, but not free() or (PUBL(free))() 
+directly. 
 
 Argument:   the result of a previous pcre_get_substring()
 Returns:    nothing
 */
 
-#if defined COMPILE_PCRE8
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
+#if defined COMPILE_PCRE8 
+PCRE_EXP_DEFN void PCRE_CALL_CONVENTION 
 pcre_free_substring(const char *pointer)
-#elif defined COMPILE_PCRE16
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre16_free_substring(PCRE_SPTR16 pointer)
-#elif defined COMPILE_PCRE32
-PCRE_EXP_DEFN void PCRE_CALL_CONVENTION
-pcre32_free_substring(PCRE_SPTR32 pointer)
-#endif
+#elif defined COMPILE_PCRE16 
+PCRE_EXP_DEFN void PCRE_CALL_CONVENTION 
+pcre16_free_substring(PCRE_SPTR16 pointer) 
+#elif defined COMPILE_PCRE32 
+PCRE_EXP_DEFN void PCRE_CALL_CONVENTION 
+pcre32_free_substring(PCRE_SPTR32 pointer) 
+#endif 
 {
-(PUBL(free))((void *)pointer);
+(PUBL(free))((void *)pointer); 
 }
 
 /* End of pcre_get.c */