Revision: 168
http://www.exim.org/viewvc/pcre2?view=rev&revision=168
Author: ph10
Date: 2014-11-28 13:58:17 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
File tidies for 10.00-RC1.
Modified Paths:
--------------
code/trunk/doc/html/pcre2jit.html
code/trunk/doc/pcre2.txt
code/trunk/doc/pcre2jit.3
code/trunk/src/pcre2.h.generic
Modified: code/trunk/doc/html/pcre2jit.html
===================================================================
--- code/trunk/doc/html/pcre2jit.html 2014-11-28 13:26:50 UTC (rev 167)
+++ code/trunk/doc/html/pcre2jit.html 2014-11-28 13:58:17 UTC (rev 168)
@@ -131,10 +131,11 @@
<P>
If the JIT compiler finds an unsupported item, no JIT data is generated. You
can find out if JIT matching is available after compiling a pattern by calling
-<b>pcre2_pattern_info()</b> with the PCRE2_INFO_JIT option. A result of 1 means
-that JIT compilation was successful. A result of 0 means that JIT support is
-not available, or the pattern was not processed by <b>pcre2_jit_compile()</b>,
-or the JIT compiler was not able to handle the pattern.
+<b>pcre2_pattern_info()</b> with the PCRE2_INFO_JITSIZE option. A non-zero
+result means that JIT compilation was successful. A result of 0 means that JIT
+support is not available, or the pattern was not processed by
+<b>pcre2_jit_compile()</b>, or the JIT compiler was not able to handle the
+pattern.
</P>
<br><a name="SEC4" href="#TOC1">UNSUPPORTED OPTIONS AND PATTERN ITEMS</a><br>
<P>
Modified: code/trunk/doc/pcre2.txt
===================================================================
--- code/trunk/doc/pcre2.txt 2014-11-28 13:26:50 UTC (rev 167)
+++ code/trunk/doc/pcre2.txt 2014-11-28 13:58:17 UTC (rev 168)
@@ -3604,11 +3604,11 @@
If the JIT compiler finds an unsupported item, no JIT data is gener-
ated. You can find out if JIT matching is available after compiling a
- pattern by calling pcre2_pattern_info() with the PCRE2_INFO_JIT option.
- A result of 1 means that JIT compilation was successful. A result of 0
- means that JIT support is not available, or the pattern was not pro-
- cessed by pcre2_jit_compile(), or the JIT compiler was not able to han-
- dle the pattern.
+ pattern by calling pcre2_pattern_info() with the PCRE2_INFO_JITSIZE
+ option. A non-zero result means that JIT compilation was successful. A
+ result of 0 means that JIT support is not available, or the pattern was
+ not processed by pcre2_jit_compile(), or the JIT compiler was not able
+ to handle the pattern.
UNSUPPORTED OPTIONS AND PATTERN ITEMS
Modified: code/trunk/doc/pcre2jit.3
===================================================================
--- code/trunk/doc/pcre2jit.3 2014-11-28 13:26:50 UTC (rev 167)
+++ code/trunk/doc/pcre2jit.3 2014-11-28 13:58:17 UTC (rev 168)
@@ -107,7 +107,7 @@
.P
If the JIT compiler finds an unsupported item, no JIT data is generated. You
can find out if JIT matching is available after compiling a pattern by calling
-\fBpcre2_pattern_info()\fP with the PCRE2_INFO_JITSIZE option. A non-zero
+\fBpcre2_pattern_info()\fP with the PCRE2_INFO_JITSIZE option. A non-zero
result means that JIT compilation was successful. A result of 0 means that JIT
support is not available, or the pattern was not processed by
\fBpcre2_jit_compile()\fP, or the JIT compiler was not able to handle the
Modified: code/trunk/src/pcre2.h.generic
===================================================================
--- code/trunk/src/pcre2.h.generic 2014-11-28 13:26:50 UTC (rev 167)
+++ code/trunk/src/pcre2.h.generic 2014-11-28 13:58:17 UTC (rev 168)
@@ -44,7 +44,7 @@
#define PCRE2_MAJOR 10
#define PCRE2_MINOR 00
#define PCRE2_PRERELEASE -RC1
-#define PCRE2_DATE 2014-11-24
+#define PCRE2_DATE 2014-11-28
/* 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
@@ -259,9 +259,9 @@
#define PCRE2_CONFIG_JITTARGET 2
#define PCRE2_CONFIG_LINKSIZE 3
#define PCRE2_CONFIG_MATCHLIMIT 4
-#define PCRE2_CONFIG_NEWLINE 6
-#define PCRE2_CONFIG_PARENSLIMIT 7
-#define PCRE2_CONFIG_RECURSIONLIMIT 5
+#define PCRE2_CONFIG_NEWLINE 5
+#define PCRE2_CONFIG_PARENSLIMIT 6
+#define PCRE2_CONFIG_RECURSIONLIMIT 7
#define PCRE2_CONFIG_STACKRECURSE 8
#define PCRE2_CONFIG_UNICODE 9
#define PCRE2_CONFIG_UNICODE_VERSION 10
@@ -324,7 +324,6 @@
uint32_t callout_number; /* Number compiled into pattern */ \
uint32_t capture_top; /* Max current capture */ \
uint32_t capture_last; /* Most recently closed capture */ \
- void *callout_data; /* Data passed in with the call */ \
PCRE2_SIZE *offset_vector; /* The offset vector */ \
PCRE2_SPTR mark; /* Pointer to current mark or NULL */ \
PCRE2_SPTR subject; /* The subject being matched */ \
@@ -369,7 +368,8 @@
PCRE2_EXP_DECL int pcre2_set_parens_nest_limit(pcre2_compile_context *, \
uint32_t); \
PCRE2_EXP_DECL int pcre2_set_compile_recursion_guard(\
- pcre2_compile_context *, int (*)(uint32_t)); \
+ pcre2_compile_context *, int (*)(uint32_t, void *), \
+ void *);
#define PCRE2_MATCH_CONTEXT_FUNCTIONS \
PCRE2_EXP_DECL \
@@ -378,7 +378,7 @@
pcre2_match_context *pcre2_match_context_create(pcre2_general_context *); \
PCRE2_EXP_DECL void pcre2_match_context_free(pcre2_match_context *); \
PCRE2_EXP_DECL int pcre2_set_callout(pcre2_match_context *, \
- int (*)(pcre2_callout_block *), void *); \
+ int (*)(pcre2_callout_block *, void *), void *); \
PCRE2_EXP_DECL int pcre2_set_match_limit(pcre2_match_context *, \
uint32_t); \
PCRE2_EXP_DECL int pcre2_set_recursion_limit(pcre2_match_context *, \
@@ -472,8 +472,8 @@
pcre2_match_data *, pcre2_match_context *); \
PCRE2_EXP_DECL void pcre2_jit_free_unused_memory(pcre2_general_context *); \
PCRE2_EXP_DECL \
- pcre2_jit_stack *pcre2_jit_stack_create(pcre2_general_context *, \
- PCRE2_SIZE, PCRE2_SIZE); \
+ pcre2_jit_stack *pcre2_jit_stack_create(PCRE2_SIZE, PCRE2_SIZE, \
+ pcre2_general_context *); \
PCRE2_EXP_DECL void pcre2_jit_stack_assign(pcre2_match_context *, \
pcre2_jit_callback, void *); \
PCRE2_EXP_DECL void pcre2_jit_stack_free(pcre2_jit_stack *);
