nlopess Sun Oct 7 12:14:02 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre php_pcre.c
Log:
fix the previous patch: the rc var doesnt need to be passed to the
make_subpats_table()
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.3&r2=1.168.2.9.2.21.2.4&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.3
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.4
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.3 Sun Oct 7 11:48:27 2007
+++ php-src/ext/pcre/php_pcre.c Sun Oct 7 12:14:02 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.3 2007/10/07 11:48:27 nlopess Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.4 2007/10/07 12:14:02 nlopess Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -175,10 +175,11 @@
/* }}} */
/* {{{ 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 @@
* 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 @@
* 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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
