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

1 files changed, 209 insertions, 209 deletions

diff --git a/contrib/libs/pcre/pcre.h b/contrib/libs/pcre/pcre.h
index 86e3956c21..133d828216 100644
--- a/contrib/libs/pcre/pcre.h
+++ b/contrib/libs/pcre/pcre.h
@@ -1,51 +1,51 @@
-/*************************************************
-*       Perl-Compatible Regular Expressions      *
-*************************************************/
-
-/* This is the public header file for the PCRE library, to be #included by
-applications that call the PCRE functions.
-
+/************************************************* 
+*       Perl-Compatible Regular Expressions      * 
+*************************************************/ 
+ 
+/* This is the public header file for the PCRE library, to be #included by 
+applications that call the PCRE functions. 
+ 
            Copyright (c) 1997-2014 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.
------------------------------------------------------------------------------
-*/
-
-#ifndef _PCRE_H
-#define _PCRE_H
-
-/* The current PCRE version information. */
-
+ 
+----------------------------------------------------------------------------- 
+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. 
+----------------------------------------------------------------------------- 
+*/ 
+ 
+#ifndef _PCRE_H 
+#define _PCRE_H 
+ 
+/* The current PCRE version information. */ 
+ 
 #define PCRE_MAJOR          8
 #define PCRE_MINOR          44
 #define PCRE_PRERELEASE     
 #define PCRE_DATE           2020-02-12
-
+ 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE, the appropriate
 export setting is defined in pcre_internal.h, which includes this file. So we
@@ -65,16 +65,16 @@ don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
 #  endif
 #endif
 
-/* By default, we use the standard "extern" declarations. */
-
-#ifndef PCRE_EXP_DECL
+/* By default, we use the standard "extern" declarations. */ 
+ 
+#ifndef PCRE_EXP_DECL 
 #  ifdef __cplusplus
 #    define PCRE_EXP_DECL  extern "C"
 #  else
 #    define PCRE_EXP_DECL  extern
 #  endif
-#endif
-
+#endif 
+ 
 #ifdef __cplusplus
 #  ifndef PCRECPP_EXP_DECL
 #    define PCRECPP_EXP_DECL  extern
@@ -82,19 +82,19 @@ don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
 #  ifndef PCRECPP_EXP_DEFN
 #    define PCRECPP_EXP_DEFN
 #  endif
-#endif
-
-/* Have to include stdlib.h in order to ensure that size_t is defined;
-it is needed here for malloc. */
-
-#include <stdlib.h>
-
-/* Allow for C++ users */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
+#endif 
+ 
+/* Have to include stdlib.h in order to ensure that size_t is defined; 
+it is needed here for malloc. */ 
+ 
+#include <stdlib.h> 
+ 
+/* Allow for C++ users */ 
+ 
+#ifdef __cplusplus 
+extern "C" { 
+#endif 
+ 
 /* Public options. Some are compile-time only, some are run-time only, and some
 are both. Most of the compile-time options are saved with the compiled regex so
 that they can be inspected during studying (and therefore JIT compiling). Note
@@ -104,12 +104,12 @@ are now used, so in order to conserve them, option bits that were previously
 only recognized at matching time (i.e. by pcre_exec() or pcre_dfa_exec()) may
 also be used for compile-time options that affect only compiling and are not
 relevant for studying or JIT compiling.
-
+ 
 Some options for pcre_compile() change its behaviour but do not affect the
 behaviour of the execution functions. Other options are passed through to the
 execution functions and affect their behaviour, with or without affecting the
 behaviour of pcre_compile().
-
+ 
 Options that can be passed to pcre_compile() are tagged Cx below, with these
 variants:
 
@@ -170,8 +170,8 @@ with J. */
 #define PCRE_NOTEMPTY_ATSTART   0x10000000  /*    E D J */
 #define PCRE_UCP                0x20000000  /* C3       */
 
-/* Exec-time and get/set-time error codes */
-
+/* Exec-time and get/set-time error codes */ 
+ 
 #define PCRE_ERROR_NOMATCH          (-1)
 #define PCRE_ERROR_NULL             (-2)
 #define PCRE_ERROR_BADOPTION        (-3)
@@ -210,7 +210,7 @@ with J. */
 #define PCRE_ERROR_JIT_BADOPTION   (-31)
 #define PCRE_ERROR_BADLENGTH       (-32)
 #define PCRE_ERROR_UNSET           (-33)
-
+ 
 /* Specific error codes for UTF-8 validity checks */
 
 #define PCRE_UTF8_ERR0               0
@@ -252,24 +252,24 @@ with J. */
 #define PCRE_UTF32_ERR2              2  /* Unused (was non-character) */
 #define PCRE_UTF32_ERR3              3
 
-/* Request types for pcre_fullinfo() */
-
-#define PCRE_INFO_OPTIONS            0
-#define PCRE_INFO_SIZE               1
-#define PCRE_INFO_CAPTURECOUNT       2
-#define PCRE_INFO_BACKREFMAX         3
-#define PCRE_INFO_FIRSTBYTE          4
-#define PCRE_INFO_FIRSTCHAR          4  /* For backwards compatibility */
-#define PCRE_INFO_FIRSTTABLE         5
-#define PCRE_INFO_LASTLITERAL        6
-#define PCRE_INFO_NAMEENTRYSIZE      7
-#define PCRE_INFO_NAMECOUNT          8
-#define PCRE_INFO_NAMETABLE          9
-#define PCRE_INFO_STUDYSIZE         10
-#define PCRE_INFO_DEFAULT_TABLES    11
-#define PCRE_INFO_OKPARTIAL         12
-#define PCRE_INFO_JCHANGED          13
-#define PCRE_INFO_HASCRORLF         14
+/* Request types for pcre_fullinfo() */ 
+ 
+#define PCRE_INFO_OPTIONS            0 
+#define PCRE_INFO_SIZE               1 
+#define PCRE_INFO_CAPTURECOUNT       2 
+#define PCRE_INFO_BACKREFMAX         3 
+#define PCRE_INFO_FIRSTBYTE          4 
+#define PCRE_INFO_FIRSTCHAR          4  /* For backwards compatibility */ 
+#define PCRE_INFO_FIRSTTABLE         5 
+#define PCRE_INFO_LASTLITERAL        6 
+#define PCRE_INFO_NAMEENTRYSIZE      7 
+#define PCRE_INFO_NAMECOUNT          8 
+#define PCRE_INFO_NAMETABLE          9 
+#define PCRE_INFO_STUDYSIZE         10 
+#define PCRE_INFO_DEFAULT_TABLES    11 
+#define PCRE_INFO_OKPARTIAL         12 
+#define PCRE_INFO_JCHANGED          13 
+#define PCRE_INFO_HASCRORLF         14 
 #define PCRE_INFO_MINLENGTH         15
 #define PCRE_INFO_JIT               16
 #define PCRE_INFO_JITSIZE           17
@@ -281,25 +281,25 @@ with J. */
 #define PCRE_INFO_MATCHLIMIT        23
 #define PCRE_INFO_RECURSIONLIMIT    24
 #define PCRE_INFO_MATCH_EMPTY       25
-
-/* Request types for pcre_config(). Do not re-arrange, in order to remain
-compatible. */
-
-#define PCRE_CONFIG_UTF8                    0
-#define PCRE_CONFIG_NEWLINE                 1
-#define PCRE_CONFIG_LINK_SIZE               2
-#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD  3
-#define PCRE_CONFIG_MATCH_LIMIT             4
-#define PCRE_CONFIG_STACKRECURSE            5
-#define PCRE_CONFIG_UNICODE_PROPERTIES      6
-#define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7
-#define PCRE_CONFIG_BSR                     8
+ 
+/* Request types for pcre_config(). Do not re-arrange, in order to remain 
+compatible. */ 
+ 
+#define PCRE_CONFIG_UTF8                    0 
+#define PCRE_CONFIG_NEWLINE                 1 
+#define PCRE_CONFIG_LINK_SIZE               2 
+#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD  3 
+#define PCRE_CONFIG_MATCH_LIMIT             4 
+#define PCRE_CONFIG_STACKRECURSE            5 
+#define PCRE_CONFIG_UNICODE_PROPERTIES      6 
+#define PCRE_CONFIG_MATCH_LIMIT_RECURSION   7 
+#define PCRE_CONFIG_BSR                     8 
 #define PCRE_CONFIG_JIT                     9
 #define PCRE_CONFIG_UTF16                  10
 #define PCRE_CONFIG_JITTARGET              11
 #define PCRE_CONFIG_UTF32                  12
 #define PCRE_CONFIG_PARENS_LIMIT           13
-
+ 
 /* Request types for pcre_study(). Do not re-arrange, in order to remain
 compatible. */
 
@@ -309,21 +309,21 @@ compatible. */
 #define PCRE_STUDY_EXTRA_NEEDED               0x0008
 
 /* Bit flags for the pcre[16|32]_extra structure. Do not re-arrange or redefine
-these bits, just add new ones on the end, in order to remain compatible. */
-
-#define PCRE_EXTRA_STUDY_DATA             0x0001
-#define PCRE_EXTRA_MATCH_LIMIT            0x0002
-#define PCRE_EXTRA_CALLOUT_DATA           0x0004
-#define PCRE_EXTRA_TABLES                 0x0008
-#define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010
+these bits, just add new ones on the end, in order to remain compatible. */ 
+ 
+#define PCRE_EXTRA_STUDY_DATA             0x0001 
+#define PCRE_EXTRA_MATCH_LIMIT            0x0002 
+#define PCRE_EXTRA_CALLOUT_DATA           0x0004 
+#define PCRE_EXTRA_TABLES                 0x0008 
+#define PCRE_EXTRA_MATCH_LIMIT_RECURSION  0x0010 
 #define PCRE_EXTRA_MARK                   0x0020
 #define PCRE_EXTRA_EXECUTABLE_JIT         0x0040
-
-/* Types */
-
+ 
+/* Types */ 
+ 
 struct real_pcre8_or_16;          /* declaration; the definition is private  */
 typedef struct real_pcre8_or_16 pcre;
-
+ 
 struct real_pcre8_or_16;          /* declaration; the definition is private  */
 typedef struct real_pcre8_or_16 pcre16;
 
@@ -361,29 +361,29 @@ pcre32 functions are not implemented. There is a check for this in pcre_internal
 #define PCRE_SPTR32 const PCRE_UCHAR32 *
 #endif
 
-/* When PCRE is compiled as a C++ library, the subject pointer type can be
-replaced with a custom type. For conventional use, the public interface is a
-const char *. */
-
-#ifndef PCRE_SPTR
-#define PCRE_SPTR const char *
-#endif
-
-/* The structure for passing additional data to pcre_exec(). This is defined in
-such as way as to be extensible. Always add new fields at the end, in order to
-remain compatible. */
-
-typedef struct pcre_extra {
-  unsigned long int flags;        /* Bits for which fields are set */
-  void *study_data;               /* Opaque data from pcre_study() */
-  unsigned long int match_limit;  /* Maximum number of calls to match() */
-  void *callout_data;             /* Data passed back in callouts */
-  const unsigned char *tables;    /* Pointer to character tables */
-  unsigned long int match_limit_recursion; /* Max recursive calls to match() */
+/* When PCRE is compiled as a C++ library, the subject pointer type can be 
+replaced with a custom type. For conventional use, the public interface is a 
+const char *. */ 
+ 
+#ifndef PCRE_SPTR 
+#define PCRE_SPTR const char * 
+#endif 
+ 
+/* The structure for passing additional data to pcre_exec(). This is defined in 
+such as way as to be extensible. Always add new fields at the end, in order to 
+remain compatible. */ 
+ 
+typedef struct pcre_extra { 
+  unsigned long int flags;        /* Bits for which fields are set */ 
+  void *study_data;               /* Opaque data from pcre_study() */ 
+  unsigned long int match_limit;  /* Maximum number of calls to match() */ 
+  void *callout_data;             /* Data passed back in callouts */ 
+  const unsigned char *tables;    /* Pointer to character tables */ 
+  unsigned long int match_limit_recursion; /* Max recursive calls to match() */ 
   unsigned char **mark;           /* For passing back a mark pointer */
   void *executable_jit;           /* Contains a pointer to a compiled jit code */
-} pcre_extra;
-
+} pcre_extra; 
+ 
 /* Same structure as above, but with 16 bit char pointers. */
 
 typedef struct pcre16_extra {
@@ -410,31 +410,31 @@ typedef struct pcre32_extra {
   void *executable_jit;           /* Contains a pointer to a compiled jit code */
 } pcre32_extra;
 
-/* The structure for passing out data via the pcre_callout_function. We use a
-structure so that new fields can be added on the end in future versions,
-without changing the API of the function, thereby allowing old clients to work
-without modification. */
-
-typedef struct pcre_callout_block {
-  int          version;           /* Identifies version of block */
-  /* ------------------------ Version 0 ------------------------------- */
-  int          callout_number;    /* Number compiled into pattern */
-  int         *offset_vector;     /* The offset vector */
-  PCRE_SPTR    subject;           /* The subject being matched */
-  int          subject_length;    /* The length of the subject */
-  int          start_match;       /* Offset to start of this match attempt */
-  int          current_position;  /* Where we currently are in the subject */
-  int          capture_top;       /* Max current capture */
-  int          capture_last;      /* Most recently closed capture */
-  void        *callout_data;      /* Data passed in with the call */
-  /* ------------------- Added for Version 1 -------------------------- */
-  int          pattern_position;  /* Offset to next item in the pattern */
-  int          next_item_length;  /* Length of next item in the pattern */
+/* The structure for passing out data via the pcre_callout_function. We use a 
+structure so that new fields can be added on the end in future versions, 
+without changing the API of the function, thereby allowing old clients to work 
+without modification. */ 
+ 
+typedef struct pcre_callout_block { 
+  int          version;           /* Identifies version of block */ 
+  /* ------------------------ Version 0 ------------------------------- */ 
+  int          callout_number;    /* Number compiled into pattern */ 
+  int         *offset_vector;     /* The offset vector */ 
+  PCRE_SPTR    subject;           /* The subject being matched */ 
+  int          subject_length;    /* The length of the subject */ 
+  int          start_match;       /* Offset to start of this match attempt */ 
+  int          current_position;  /* Where we currently are in the subject */ 
+  int          capture_top;       /* Max current capture */ 
+  int          capture_last;      /* Most recently closed capture */ 
+  void        *callout_data;      /* Data passed in with the call */ 
+  /* ------------------- Added for Version 1 -------------------------- */ 
+  int          pattern_position;  /* Offset to next item in the pattern */ 
+  int          next_item_length;  /* Length of next item in the pattern */ 
   /* ------------------- Added for Version 2 -------------------------- */
   const unsigned char *mark;      /* Pointer to current mark or NULL    */
-  /* ------------------------------------------------------------------ */
-} pcre_callout_block;
-
+  /* ------------------------------------------------------------------ */ 
+} pcre_callout_block; 
+ 
 /* Same structure as above, but with 16 bit char pointers. */
 
 typedef struct pcre16_callout_block {
@@ -479,18 +479,18 @@ typedef struct pcre32_callout_block {
   /* ------------------------------------------------------------------ */
 } pcre32_callout_block;
 
-/* Indirection for store get and free functions. These can be set to
-alternative malloc/free functions if required. Special ones are used in the
-non-recursive case for "frames". There is also an optional callout function
-that is triggered by the (?) regex item. For Virtual Pascal, these definitions
-have to take another form. */
-
-#ifndef VPCOMPAT
-PCRE_EXP_DECL void *(*pcre_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre_free)(void *);
-PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
-PCRE_EXP_DECL void  (*pcre_stack_free)(void *);
-PCRE_EXP_DECL int   (*pcre_callout)(pcre_callout_block *);
+/* Indirection for store get and free functions. These can be set to 
+alternative malloc/free functions if required. Special ones are used in the 
+non-recursive case for "frames". There is also an optional callout function 
+that is triggered by the (?) regex item. For Virtual Pascal, these definitions 
+have to take another form. */ 
+ 
+#ifndef VPCOMPAT 
+PCRE_EXP_DECL void *(*pcre_malloc)(size_t); 
+PCRE_EXP_DECL void  (*pcre_free)(void *); 
+PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t); 
+PCRE_EXP_DECL void  (*pcre_stack_free)(void *); 
+PCRE_EXP_DECL int   (*pcre_callout)(pcre_callout_block *); 
 PCRE_EXP_DECL int   (*pcre_stack_guard)(void);
 
 PCRE_EXP_DECL void *(*pcre16_malloc)(size_t);
@@ -506,12 +506,12 @@ PCRE_EXP_DECL void *(*pcre32_stack_malloc)(size_t);
 PCRE_EXP_DECL void  (*pcre32_stack_free)(void *);
 PCRE_EXP_DECL int   (*pcre32_callout)(pcre32_callout_block *);
 PCRE_EXP_DECL int   (*pcre32_stack_guard)(void);
-#else   /* VPCOMPAT */
-PCRE_EXP_DECL void *pcre_malloc(size_t);
-PCRE_EXP_DECL void  pcre_free(void *);
-PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
-PCRE_EXP_DECL void  pcre_stack_free(void *);
-PCRE_EXP_DECL int   pcre_callout(pcre_callout_block *);
+#else   /* VPCOMPAT */ 
+PCRE_EXP_DECL void *pcre_malloc(size_t); 
+PCRE_EXP_DECL void  pcre_free(void *); 
+PCRE_EXP_DECL void *pcre_stack_malloc(size_t); 
+PCRE_EXP_DECL void  pcre_stack_free(void *); 
+PCRE_EXP_DECL int   pcre_callout(pcre_callout_block *); 
 PCRE_EXP_DECL int   pcre_stack_guard(void);
 
 PCRE_EXP_DECL void *pcre16_malloc(size_t);
@@ -527,33 +527,33 @@ PCRE_EXP_DECL void *pcre32_stack_malloc(size_t);
 PCRE_EXP_DECL void  pcre32_stack_free(void *);
 PCRE_EXP_DECL int   pcre32_callout(pcre32_callout_block *);
 PCRE_EXP_DECL int   pcre32_stack_guard(void);
-#endif  /* VPCOMPAT */
-
+#endif  /* VPCOMPAT */ 
+ 
 /* User defined callback which provides a stack just before the match starts. */
 
 typedef pcre_jit_stack *(*pcre_jit_callback)(void *);
 typedef pcre16_jit_stack *(*pcre16_jit_callback)(void *);
 typedef pcre32_jit_stack *(*pcre32_jit_callback)(void *);
 
-/* Exported PCRE functions */
-
-PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,
-                  const unsigned char *);
+/* Exported PCRE functions */ 
+ 
+PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *, 
+                  const unsigned char *); 
 PCRE_EXP_DECL pcre16 *pcre16_compile(PCRE_SPTR16, int, const char **, int *,
                   const unsigned char *);
 PCRE_EXP_DECL pcre32 *pcre32_compile(PCRE_SPTR32, int, const char **, int *,
                   const unsigned char *);
-PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,
-                  int *, const unsigned char *);
+PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **, 
+                  int *, const unsigned char *); 
 PCRE_EXP_DECL pcre16 *pcre16_compile2(PCRE_SPTR16, int, int *, const char **,
                   int *, const unsigned char *);
 PCRE_EXP_DECL pcre32 *pcre32_compile2(PCRE_SPTR32, int, int *, const char **,
                   int *, const unsigned char *);
-PCRE_EXP_DECL int  pcre_config(int, void *);
+PCRE_EXP_DECL int  pcre_config(int, void *); 
 PCRE_EXP_DECL int  pcre16_config(int, void *);
 PCRE_EXP_DECL int  pcre32_config(int, void *);
-PCRE_EXP_DECL int  pcre_copy_named_substring(const pcre *, const char *,
-                  int *, int, const char *, char *, int);
+PCRE_EXP_DECL int  pcre_copy_named_substring(const pcre *, const char *, 
+                  int *, int, const char *, char *, int); 
 PCRE_EXP_DECL int  pcre16_copy_named_substring(const pcre16 *, PCRE_SPTR16,
                   int *, int, PCRE_SPTR16, PCRE_UCHAR16 *, int);
 PCRE_EXP_DECL int  pcre32_copy_named_substring(const pcre32 *, PCRE_SPTR32,
@@ -564,14 +564,14 @@ PCRE_EXP_DECL int  pcre16_copy_substring(PCRE_SPTR16, int *, int, int,
                   PCRE_UCHAR16 *, int);
 PCRE_EXP_DECL int  pcre32_copy_substring(PCRE_SPTR32, int *, int, int,
                   PCRE_UCHAR32 *, int);
-PCRE_EXP_DECL int  pcre_dfa_exec(const pcre *, const pcre_extra *,
-                  const char *, int, int, int, int *, int , int *, int);
+PCRE_EXP_DECL int  pcre_dfa_exec(const pcre *, const pcre_extra *, 
+                  const char *, int, int, int, int *, int , int *, int); 
 PCRE_EXP_DECL int  pcre16_dfa_exec(const pcre16 *, const pcre16_extra *,
                   PCRE_SPTR16, int, int, int, int *, int , int *, int);
 PCRE_EXP_DECL int  pcre32_dfa_exec(const pcre32 *, const pcre32_extra *,
                   PCRE_SPTR32, int, int, int, int *, int , int *, int);
-PCRE_EXP_DECL int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
-                   int, int, int, int *, int);
+PCRE_EXP_DECL int  pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR, 
+                   int, int, int, int *, int); 
 PCRE_EXP_DECL int  pcre16_exec(const pcre16 *, const pcre16_extra *,
                    PCRE_SPTR16, int, int, int, int *, int);
 PCRE_EXP_DECL int  pcre32_exec(const pcre32 *, const pcre32_extra *,
@@ -585,61 +585,61 @@ PCRE_EXP_DECL int  pcre16_jit_exec(const pcre16 *, const pcre16_extra *,
 PCRE_EXP_DECL int  pcre32_jit_exec(const pcre32 *, const pcre32_extra *,
                    PCRE_SPTR32, int, int, int, int *, int,
                    pcre32_jit_stack *);
-PCRE_EXP_DECL void pcre_free_substring(const char *);
+PCRE_EXP_DECL void pcre_free_substring(const char *); 
 PCRE_EXP_DECL void pcre16_free_substring(PCRE_SPTR16);
 PCRE_EXP_DECL void pcre32_free_substring(PCRE_SPTR32);
-PCRE_EXP_DECL void pcre_free_substring_list(const char **);
+PCRE_EXP_DECL void pcre_free_substring_list(const char **); 
 PCRE_EXP_DECL void pcre16_free_substring_list(PCRE_SPTR16 *);
 PCRE_EXP_DECL void pcre32_free_substring_list(PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_fullinfo(const pcre *, const pcre_extra *, int,
-                  void *);
+PCRE_EXP_DECL int  pcre_fullinfo(const pcre *, const pcre_extra *, int, 
+                  void *); 
 PCRE_EXP_DECL int  pcre16_fullinfo(const pcre16 *, const pcre16_extra *, int,
                   void *);
 PCRE_EXP_DECL int  pcre32_fullinfo(const pcre32 *, const pcre32_extra *, int,
                   void *);
-PCRE_EXP_DECL int  pcre_get_named_substring(const pcre *, const char *,
-                  int *, int, const char *, const char **);
+PCRE_EXP_DECL int  pcre_get_named_substring(const pcre *, const char *, 
+                  int *, int, const char *, const char **); 
 PCRE_EXP_DECL int  pcre16_get_named_substring(const pcre16 *, PCRE_SPTR16,
                   int *, int, PCRE_SPTR16, PCRE_SPTR16 *);
 PCRE_EXP_DECL int  pcre32_get_named_substring(const pcre32 *, PCRE_SPTR32,
                   int *, int, PCRE_SPTR32, PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_get_stringnumber(const pcre *, const char *);
+PCRE_EXP_DECL int  pcre_get_stringnumber(const pcre *, const char *); 
 PCRE_EXP_DECL int  pcre16_get_stringnumber(const pcre16 *, PCRE_SPTR16);
 PCRE_EXP_DECL int  pcre32_get_stringnumber(const pcre32 *, PCRE_SPTR32);
-PCRE_EXP_DECL int  pcre_get_stringtable_entries(const pcre *, const char *,
-                  char **, char **);
+PCRE_EXP_DECL int  pcre_get_stringtable_entries(const pcre *, const char *, 
+                  char **, char **); 
 PCRE_EXP_DECL int  pcre16_get_stringtable_entries(const pcre16 *, PCRE_SPTR16,
                   PCRE_UCHAR16 **, PCRE_UCHAR16 **);
 PCRE_EXP_DECL int  pcre32_get_stringtable_entries(const pcre32 *, PCRE_SPTR32,
                   PCRE_UCHAR32 **, PCRE_UCHAR32 **);
-PCRE_EXP_DECL int  pcre_get_substring(const char *, int *, int, int,
-                  const char **);
+PCRE_EXP_DECL int  pcre_get_substring(const char *, int *, int, int, 
+                  const char **); 
 PCRE_EXP_DECL int  pcre16_get_substring(PCRE_SPTR16, int *, int, int,
                   PCRE_SPTR16 *);
 PCRE_EXP_DECL int  pcre32_get_substring(PCRE_SPTR32, int *, int, int,
                   PCRE_SPTR32 *);
-PCRE_EXP_DECL int  pcre_get_substring_list(const char *, int *, int,
-                  const char ***);
+PCRE_EXP_DECL int  pcre_get_substring_list(const char *, int *, int, 
+                  const char ***); 
 PCRE_EXP_DECL int  pcre16_get_substring_list(PCRE_SPTR16, int *, int,
                   PCRE_SPTR16 **);
 PCRE_EXP_DECL int  pcre32_get_substring_list(PCRE_SPTR32, int *, int,
                   PCRE_SPTR32 **);
-PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
+PCRE_EXP_DECL const unsigned char *pcre_maketables(void); 
 PCRE_EXP_DECL const unsigned char *pcre16_maketables(void);
 PCRE_EXP_DECL const unsigned char *pcre32_maketables(void);
-PCRE_EXP_DECL int  pcre_refcount(pcre *, int);
+PCRE_EXP_DECL int  pcre_refcount(pcre *, int); 
 PCRE_EXP_DECL int  pcre16_refcount(pcre16 *, int);
 PCRE_EXP_DECL int  pcre32_refcount(pcre32 *, int);
-PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);
+PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **); 
 PCRE_EXP_DECL pcre16_extra *pcre16_study(const pcre16 *, int, const char **);
 PCRE_EXP_DECL pcre32_extra *pcre32_study(const pcre32 *, int, const char **);
 PCRE_EXP_DECL void pcre_free_study(pcre_extra *);
 PCRE_EXP_DECL void pcre16_free_study(pcre16_extra *);
 PCRE_EXP_DECL void pcre32_free_study(pcre32_extra *);
-PCRE_EXP_DECL const char *pcre_version(void);
+PCRE_EXP_DECL const char *pcre_version(void); 
 PCRE_EXP_DECL const char *pcre16_version(void);
 PCRE_EXP_DECL const char *pcre32_version(void);
-
+ 
 /* Utility functions for byte order swaps. */
 PCRE_EXP_DECL int  pcre_pattern_to_host_byte_order(pcre *, pcre_extra *,
                   const unsigned char *);
@@ -670,8 +670,8 @@ PCRE_EXP_DECL void pcre_jit_free_unused_memory(void);
 PCRE_EXP_DECL void pcre16_jit_free_unused_memory(void);
 PCRE_EXP_DECL void pcre32_jit_free_unused_memory(void);
 
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-#endif /* End of pcre.h */
+#ifdef __cplusplus 
+}  /* extern "C" */ 
+#endif 
+ 
+#endif /* End of pcre.h */