com php-src: fix pcre usage in spl: ext/spl/spl_iterators.c
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 10:14:15 +0000 |
| Subject: | com php-src: fix pcre usage in spl: ext/spl/spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73461@lists.php.net to get a copy of this message | ||
Commit: 84e13901b0ec7041ea7d85b383577dcd968e9384
Author: Anatol Belski <ab@php.net> Fri, 23 Aug 2013 06:47:18 -0700
Parents: 69ea580aad2932921b49e8fab89ab851e08a63da
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=84e13901b0ec7041ea7d85b383577dcd968e9384
Log:
fix pcre usage in spl
Changed paths:
M ext/spl/spl_iterators.c
Diff:
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 5c8c3c7..f44f80d 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1079,9 +1079,9 @@ SPL_METHOD(RecursiveTreeIterator, setPostfix)
{
spl_recursive_it_object *object =
(spl_recursive_it_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
char* postfix;
- int postfix_len;
+ zend_str_size_int postfix_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &postfix,
&postfix_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &postfix,
&postfix_len) == FAILURE) {
return;
}
@@ -1967,7 +1967,8 @@ SPL_METHOD(RegexIterator, accept)
spl_dual_it_object *intern;
char *subject, *result;
zend_str_size_int subject_len;
- int use_copy, count = 0, result_len;
+ int use_copy, count = 0;
+ zend_str_size_int result_len;
zval *subject_ptr, subject_copy, zcount, *replacement, tmp_replacement;
if (zend_parse_parameters_none() == FAILURE) {