diff --git a/Makefile.am b/Makefile.am index c7e446e..a370db2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ dist_html_DATA = \ doc/html/pcre2_set_callout.html \ doc/html/pcre2_set_character_tables.html \ doc/html/pcre2_set_compile_recursion_guard.html \ + doc/html/pcre2_set_depth_limit.html \ doc/html/pcre2_set_match_limit.html \ doc/html/pcre2_set_max_pattern_length.html \ doc/html/pcre2_set_offset_limit.html \ @@ -151,6 +152,7 @@ dist_man_MANS = \ doc/pcre2_set_callout.3 \ doc/pcre2_set_character_tables.3 \ doc/pcre2_set_compile_recursion_guard.3 \ + doc/pcre2_set_depth_limit.3 \ doc/pcre2_set_match_limit.3 \ doc/pcre2_set_max_pattern_length.3 \ doc/pcre2_set_offset_limit.3 \ diff --git a/doc/html/index.html b/doc/html/index.html index eebb80b..3920426 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -213,6 +213,9 @@ in the library.
This function frees the memory occupied by a match data block, using the memory -freeing function from the general context with which it was created, or -free() if that was not set. +freeing function from the general context or compiled pattern with which it was +created, or free() if that was not set.
There is a complete description of the PCRE2 native API in the diff --git a/doc/html/pcre2_pattern_info.html b/doc/html/pcre2_pattern_info.html index b4cd6f5..fdda26b 100644 --- a/doc/html/pcre2_pattern_info.html +++ b/doc/html/pcre2_pattern_info.html @@ -41,27 +41,25 @@ request are as follows: PCRE2_BSR_UNICODE: Unicode line endings PCRE2_BSR_ANYCRLF: CR, LF, or CRLF only PCRE2_INFO_CAPTURECOUNT Number of capturing subpatterns + PCRE2_INFO_DEPTHLIMIT Backtracking depth limit if set, otherwise PCRE2_ERROR_UNSET PCRE2_INFO_FIRSTBITMAP Bitmap of first code units, or NULL PCRE2_INFO_FIRSTCODETYPE Type of start-of-match information 0 nothing set 1 first code unit is set 2 start of string or after newline PCRE2_INFO_FIRSTCODEUNIT First code unit when type is 1 + PCRE2_INFO_FRAMESIZE Size of backtracking frame PCRE2_INFO_HASBACKSLASHC Return 1 if pattern contains \C - PCRE2_INFO_HASCRORLF Return 1 if explicit CR or LF matches - exist in the pattern + PCRE2_INFO_HASCRORLF Return 1 if explicit CR or LF matches exist in the pattern PCRE2_INFO_JCHANGED Return 1 if (?J) or (?-J) was used PCRE2_INFO_JITSIZE Size of JIT compiled code, or 0 PCRE2_INFO_LASTCODETYPE Type of must-be-present information 0 nothing set 1 code unit is set PCRE2_INFO_LASTCODEUNIT Last code unit when type is 1 - PCRE2_INFO_MATCHEMPTY 1 if the pattern can match an - empty string, 0 otherwise - PCRE2_INFO_MATCHLIMIT Match limit if set, - otherwise PCRE2_ERROR_UNSET - PCRE2_INFO_MAXLOOKBEHIND Length (in characters) of the longest - lookbehind assertion + PCRE2_INFO_MATCHEMPTY 1 if the pattern can match an empty string, 0 otherwise + PCRE2_INFO_MATCHLIMIT Match limit if set, otherwise PCRE2_ERROR_UNSET + PCRE2_INFO_MAXLOOKBEHIND Length (in characters) of the longest lookbehind assertion PCRE2_INFO_MINLENGTH Lower bound length of matching strings PCRE2_INFO_NAMECOUNT Number of named subpatterns PCRE2_INFO_NAMEENTRYSIZE Size of name table entries @@ -72,8 +70,7 @@ request are as follows: PCRE2_NEWLINE_CRLF PCRE2_NEWLINE_ANY PCRE2_NEWLINE_ANYCRLF - PCRE2_INFO_RECURSIONLIMIT Recursion limit if set, - otherwise PCRE2_ERROR_UNSET + PCRE2_INFO_RECURSIONLIMIT Obsolete synonym for PCRE2_INFO_DEPTHLIMIT PCRE2_INFO_SIZE Size of compiled pattern If where is NULL, the function returns the amount of memory needed for diff --git a/doc/html/pcre2_set_callout.html b/doc/html/pcre2_set_callout.html index 635e0c2..4e7aca6 100644 --- a/doc/html/pcre2_set_callout.html +++ b/doc/html/pcre2_set_callout.html @@ -29,7 +29,7 @@ DESCRIPTION
This function sets the callout fields in a match context (the first argument). The second argument specifies a callout function, and the third argument is an -opaque data time that is passed to it. The result of this function is always +opaque data item that is passed to it. The result of this function is always zero.
diff --git a/doc/html/pcre2_set_depth_limit.html b/doc/html/pcre2_set_depth_limit.html new file mode 100644 index 0000000..a1cf706 --- /dev/null +++ b/doc/html/pcre2_set_depth_limit.html @@ -0,0 +1,40 @@ + +
++Return to the PCRE2 index page. +
+
+This page is part of the PCRE2 HTML documentation. It was generated
+automatically from the original man page. If there is any nonsense in it,
+please consult the man page, in case the conversion went wrong.
+
+
+SYNOPSIS
+
+
+#include <pcre2.h> +
++int pcre2_set_depth_limit(pcre2_match_context *mcontext, + uint32_t value); +
++This function sets the backtracking depth limit field in a match context. The +result is always zero. +
++There is a complete description of the PCRE2 native API in the +pcre2api +page and a description of the POSIX API in the +pcre2posix +page. +
+Return to the PCRE2 index page. +
diff --git a/doc/html/pcre2_set_recursion_limit.html b/doc/html/pcre2_set_recursion_limit.html index 5adcc99..c415aa3 100644 --- a/doc/html/pcre2_set_recursion_limit.html +++ b/doc/html/pcre2_set_recursion_limit.html @@ -26,8 +26,8 @@ SYNOPSIS DESCRIPTION-This function sets the recursion limit field in a match context. The result is -always zero. +This function is obsolete and should not be used in new code. Use +pcre2_set_depth_limit() instead.
There is a complete description of the PCRE2 native API in the
diff --git a/doc/html/pcre2_set_recursion_memory_management.html b/doc/html/pcre2_set_recursion_memory_management.html
index ec18947..1e057b9 100644
--- a/doc/html/pcre2_set_recursion_memory_management.html
+++ b/doc/html/pcre2_set_recursion_memory_management.html
@@ -28,13 +28,8 @@ SYNOPSIS
DESCRIPTION
-This function sets the match context fields for custom memory management when -PCRE2 is compiled to use the heap instead of the system stack for recursive -function calls while matching. When PCRE2 is compiled to use the stack (the -default) this function does nothing. The first argument is a match context, the -second and third specify the memory allocation and freeing functions, and the -final argument is an opaque value that is passed to them whenever they are -called. The result of this function is always zero. +From release 10.30 onwards, this function is obsolete and does nothing. The +result is always zero.
There is a complete description of the PCRE2 native API in the
diff --git a/doc/html/pcre2test.html b/doc/html/pcre2test.html
index 005df95..76dbae1 100644
--- a/doc/html/pcre2test.html
+++ b/doc/html/pcre2test.html
@@ -1377,11 +1377,15 @@ is added to the non-match message.
Showing memory usage
-The memory modifier causes pcre2test to log all heap memory -allocation and freeing calls that occur during a call to pcre2_match(). -These occur only when a match requires a bigger vector than the default for -remembering backtracking points. In many cases there will be none. No heap -memory is allocated during matching with pcre2_dfa_match or with JIT. +The memory modifier causes pcre2test to log the sizes of all heap +memory allocation and freeing calls that occur during a call to +pcre2_match(). These occur only when a match requires a bigger vector +than the default for remembering backtracking points. In many cases there will +be no heap memory used and therefore no additional output. No heap memory is +allocated during matching with pcre2_dfa_match or with JIT, so in those +cases the memory modifier never has any effect. For this modifier to +work, the null_context modifier must not be set on both the pattern and +the subject, though it can be set on one or the other.
-Last updated: 24 March 2017
+Last updated: 25 March 2017
Copyright © 1997-2017 University of Cambridge.
diff --git a/doc/index.html.src b/doc/index.html.src
index eebb80b..3920426 100644
--- a/doc/index.html.src
+++ b/doc/index.html.src
@@ -213,6 +213,9 @@ in the library.