helly Thu Jul 20 21:32:44 2006 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
# Sometimes i hate CVS and have no idea what it is doing
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.142&r2=1.143&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.142
php-src/ext/spl/spl_iterators.c:1.143
--- php-src/ext/spl/spl_iterators.c:1.142 Thu Jul 20 21:21:19 2006
+++ php-src/ext/spl/spl_iterators.c Thu Jul 20 21:32:44 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.142 2006/07/20 21:21:19 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.143 2006/07/20 21:32:44 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1443,13 +1443,8 @@
}
zval_ptr_dtor(&intern->current.data);
MAKE_STD_ZVAL(intern->current.data);
-<<<<<<< spl_iterators.c
php_pcre_match_impl(intern->u.regex.pce, subject, subject_len,
&zcount,
intern->current.data, intern->u.regex.mode ==
REGIT_MODE_ALL_MATCHES, intern->u.regex.use_flags, intern->u.regex.preg_flags,
0 TSRMLS_CC);
-=======
- php_pcre_match(regex, extra, subject, subject_len, &zcount,
- intern->current.data, intern->u.regex.mode ==
REGIT_MODE_ALL_MATCHES, 0, 0, 0, 0 TSRMLS_CC);
->>>>>>> 1.141
count =
zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
RETVAL_BOOL(count > 0);
break;
@@ -1461,11 +1456,7 @@
}
zval_ptr_dtor(&intern->current.data);
MAKE_STD_ZVAL(intern->current.data);
-<<<<<<< spl_iterators.c
php_pcre_split_impl(intern->u.regex.pce, subject, subject_len,
intern->current.data, -1, intern->u.regex.preg_flags TSRMLS_CC);
-=======
- php_pcre_split(regex, extra, subject, subject_len,
intern->current.data, 0, -1, 0, 0, 0 TSRMLS_CC);
->>>>>>> 1.141
count =
zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
RETVAL_BOOL(count > 1);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
