summaryrefslogtreecommitdiff
path: root/src/pcre2_substring.c
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2014-12-01 16:14:53 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2014-12-01 16:14:53 +0000
commit9da47480045c6cc9fc49cd2752b0fa520a58287c (patch)
tree95ad4b536269f02421242755e8b48b11c6aeb3ad /src/pcre2_substring.c
parent08de510bcf169f076c481ffa4e274ff5c0480c68 (diff)
downloadpcre2-9da47480045c6cc9fc49cd2752b0fa520a58287c.tar.gz
(1) uint32_t for substring number args; (2) correct PRIV(memctl_malloc)
definition for Windows; (3) remove unwanted PCRE2_EXP_DATA_DEFN; (4) documentation updates. git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@171 6239d852-aaf2-0410-a92c-79f79f948069
Diffstat (limited to 'src/pcre2_substring.c')
-rw-r--r--src/pcre2_substring.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pcre2_substring.c b/src/pcre2_substring.c
index 92adbac..d0826ff 100644
--- a/src/pcre2_substring.c
+++ b/src/pcre2_substring.c
@@ -79,7 +79,7 @@ int entrysize = pcre2_substring_nametable_scan(match_data->code, stringname,
if (entrysize < 0) return entrysize;
for (entry = first; entry <= last; entry += entrysize)
{
- uint16_t n = GET2(entry, 0);
+ uint32_t n = GET2(entry, 0);
if (n < match_data->oveccount && match_data->ovector[n*2] != PCRE2_UNSET)
return pcre2_substring_copy_bynumber(match_data, n, buffer, sizeptr);
}
@@ -109,7 +109,7 @@ Returns: if successful: 0
PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
pcre2_substring_copy_bynumber(pcre2_match_data *match_data,
- unsigned int stringnumber, PCRE2_UCHAR *buffer, PCRE2_SIZE *sizeptr)
+ uint32_t stringnumber, PCRE2_UCHAR *buffer, PCRE2_SIZE *sizeptr)
{
PCRE2_SIZE left, right;
PCRE2_SIZE p = 0;
@@ -160,7 +160,7 @@ int entrysize = pcre2_substring_nametable_scan(match_data->code, stringname,
if (entrysize < 0) return entrysize;
for (entry = first; entry <= last; entry += entrysize)
{
- uint16_t n = GET2(entry, 0);
+ uint32_t n = GET2(entry, 0);
if (n < match_data->oveccount && match_data->ovector[n*2] != PCRE2_UNSET)
return pcre2_substring_get_bynumber(match_data, n, stringptr, sizeptr);
}
@@ -190,7 +190,7 @@ Returns: if successful: zero
PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
pcre2_substring_get_bynumber(pcre2_match_data *match_data,
- unsigned int stringnumber, PCRE2_UCHAR **stringptr, PCRE2_SIZE *sizeptr)
+ uint32_t stringnumber, PCRE2_UCHAR **stringptr, PCRE2_SIZE *sizeptr)
{
PCRE2_SIZE left, right;
PCRE2_SIZE p = 0;
@@ -263,7 +263,7 @@ int entrysize = pcre2_substring_nametable_scan(match_data->code, stringname,
if (entrysize <= 0) return entrysize;
for (entry = first; entry <= last; entry += entrysize)
{
- uint16_t n = GET2(entry, 0);
+ uint32_t n = GET2(entry, 0);
if (n < match_data->oveccount && match_data->ovector[n*2] != PCRE2_UNSET)
return pcre2_substring_length_bynumber(match_data, n, sizeptr);
}
@@ -288,7 +288,7 @@ Returns: 0 if successful, else a negative error number
PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
pcre2_substring_length_bynumber(pcre2_match_data *match_data,
- unsigned int stringnumber, PCRE2_SIZE *sizeptr)
+ uint32_t stringnumber, PCRE2_SIZE *sizeptr)
{
if (stringnumber >= match_data->oveccount ||
stringnumber > match_data->code->top_bracket ||