cvs: php-src(PHP_5_2) /ext/pcre php_pcre.c
| From: | Ilia Alshanetsky | Date: | Tue, 12 Dec 2006 15:35:16 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/pcre php_pcre.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42080@lists.php.net to get a copy of this message | ||
iliaa Tue Dec 12 15:35:16 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre php_pcre.c
Log:
Removed dummy vars.
# Patch by Matt Wilmas
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.12&r2=1.168.2.9.2.13&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.12 php-src/ext/pcre/php_pcre.c:1.168.2.9.2.13
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.12 Tue Oct 10 12:44:02 2006
+++ php-src/ext/pcre/php_pcre.c Tue Dec 12 15:35:16 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.12 2006/10/10 12:44:02 tony2001 Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.13 2006/12/12 15:35:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -559,8 +559,7 @@
}
if (name_cnt > 0) {
int rc1, rc2;
- long dummy_l;
- double dummy_d;
+
rc1 = pcre_fullinfo(pce->re, extra, PCRE_INFO_NAMETABLE, &name_table);
rc2 = pcre_fullinfo(pce->re, extra, PCRE_INFO_NAMEENTRYSIZE, &name_size);
rc = rc2 ? rc2 : rc1;
@@ -574,7 +573,7 @@
while (ni++ < name_cnt) {
name_idx = 0xff * name_table[0] + name_table[1];
subpat_names[name_idx] = name_table + 2;
- if (is_numeric_string(subpat_names[name_idx], strlen(subpat_names[name_idx]), &dummy_l,
&dummy_d, 0) > 0) {
+ if (is_numeric_string(subpat_names[name_idx], strlen(subpat_names[name_idx]), NULL, NULL, 0)
> 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Numeric named subpatterns are not
allowed");
efree(offsets);
efree(subpat_names);