nlopess Tue Sep 2 19:13:24 2008 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
MFB: kill unused var
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.239&r2=1.240&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.239 php-src/ext/pcre/php_pcre.c:1.240
--- php-src/ext/pcre/php_pcre.c:1.239 Sun Aug 24 12:34:02 2008
+++ php-src/ext/pcre/php_pcre.c Tue Sep 2 19:13:24 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.239 2008/08/24 12:34:02 helly Exp $ */
+/* $Id: php_pcre.c,v 1.240 2008/09/02 19:13:24 nlopess Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -602,7 +602,6 @@
int matched; /* Has
anything matched */
int g_notempty = 0; /* If the match
should not be empty */
const char **stringlist; /* Holds list of
subpatterns */
- char *match; /* The current
match */
char **subpat_names; /* Array for named
subpatterns */
int i, rc;
int subpats_order; /* Order of
subpattern matches */
@@ -696,7 +695,6 @@
}
}
- match = NULL;
matched = 0;
PCRE_G(error_code) = PHP_PCRE_NO_ERROR;
@@ -717,7 +715,6 @@
/* If something has matched */
if (count > 0) {
matched++;
- match = subject + offsets[0];
/* If subpatterns array has been passed, fill it in
with values. */
if (subpats != NULL) {
@@ -1636,8 +1633,7 @@
int start_offset; /* Where the
new search starts */
int next_offset; /* End of the
last delimiter match + 1 */
int g_notempty = 0; /* If the match
should not be empty */
- char *match, /* The current
match */
- *last_match; /* Location of
last match */
+ char *last_match; /* Location of last
match */
int rc;
int no_empty; /* If
NO_EMPTY flag is set */
int delim_capture; /* If
delimiters should be captured */
@@ -1675,7 +1671,6 @@
start_offset = 0;
next_offset = 0;
last_match = subject;
- match = NULL;
PCRE_G(error_code) = PHP_PCRE_NO_ERROR;
if (utype != IS_UNICODE && !(pce->compile_options & PCRE_UTF8)) {
@@ -1699,8 +1694,6 @@
/* If something matched */
if (count > 0) {
- match = subject + offsets[0];
-
if (!no_empty || &subject[offsets[0]] != last_match) {
if (offset_capture) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
