From 3adfe9c0f181da4cbbd6d02c71a79f322e62e431 Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Sun, 7 Oct 2007 12:14:02 +0000 Subject: fix the previous patch: the rc var doesnt need to be passed to the make_subpats_table() --- ext/pcre/php_pcre.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ext/pcre/php_pcre.c') diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index deaca774eb..377e2f24aa 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -175,10 +175,11 @@ static int pcre_clean_cache(void *data, void *arg TSRMLS_DC) /* }}} */ /* {{{ static make_subpats_table */ -static char **make_subpats_table(int num_subpats, int rc, pcre_cache_entry *pce) +static char **make_subpats_table(int num_subpats, pcre_cache_entry *pce) { pcre_extra *extra = pce->extra; int name_cnt = 0, name_size, ni = 0; + int rc; char *name_table; unsigned short name_idx; char **subpat_names = (char **)ecalloc(num_subpats, sizeof(char *)); @@ -588,7 +589,7 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec * allocate the table, even though there may be no named subpatterns. This * avoids somewhat more complicated logic in the inner loops. */ - subpat_names = make_subpats_table(num_subpats, rc, pce); + subpat_names = make_subpats_table(num_subpats, pce); if (!subpat_names) { RETURN_FALSE; } @@ -1014,7 +1015,7 @@ PHPAPI char *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, int sub * allocate the table, even though there may be no named subpatterns. This * avoids somewhat more complicated logic in the inner loops. */ - subpat_names = make_subpats_table(num_subpats, rc, pce); + subpat_names = make_subpats_table(num_subpats, pce); if (!subpat_names) { return NULL; } -- cgit v1.2.1