diff options
| author | Nuno Lopes <nlopess@php.net> | 2007-10-07 12:14:02 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2007-10-07 12:14:02 +0000 |
| commit | 3adfe9c0f181da4cbbd6d02c71a79f322e62e431 (patch) | |
| tree | e254a5d0ec92be5b27b2e4e9b473e99efae211f8 | |
| parent | 640db15ff814493762e7d30f3a014ce1e5ac030c (diff) | |
| download | php-git-3adfe9c0f181da4cbbd6d02c71a79f322e62e431.tar.gz | |
fix the previous patch: the rc var doesnt need to be passed to the make_subpats_table()
| -rw-r--r-- | ext/pcre/php_pcre.c | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |