php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-25 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

preg_match_all() now returns the number of global matches.

Browse Source
This commit is contained in:
Andrey Hristov
1999-05-30 14:48:39 +00:00
parent 88029643d0
commit aba3ea97cd
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/pcre/pcre.c
View File

@@ -380,6 +380,7 @@ void _pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
piece = subject->value.str.val;
subject_end = piece + subject->value.str.len;
match = NULL;
matched = 0;
do {
/* Execute the regular expression. */
@@ -396,7 +397,7 @@ void _pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
/* If something has matched */
if (count >= 0) {
matched = 1;
matched++;
match = piece + offsets[0];
/* If subpatters array has been passed, fill it in with values. */
@@ -445,10 +446,6 @@ void _pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
piece += offsets[1];
}
}
/* If nothing matched */
else {
matched = 0;
}
} while (global && count >= 0);
/* Add the match sets to the output array and clean up */