com php-src: backport ext/spl: ext/spl/spl_array.c ext/sp l/spl_directory.c ext/spl/spl_fixedarray.c ext/spl/ spl_iterators.c

From: Date: Sat, 15 Feb 2014 19:38:36 +0000
Subject: com php-src: backport ext/spl: ext/spl/spl_array.c ext/sp l/spl_directory.c ext/spl/spl_fixedarray.c ext/spl/ spl_iterators.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76072@lists.php.net to get a copy of this message
Commit: 23679f5a014f49bc1e20a715584cefa10c7b4878 Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 20:38:36 +0100 Parents: beb11f69f335e68489edbb2b06db20f794138496 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=23679f5a014f49bc1e20a715584cefa10c7b4878 Log: backport ext/spl Changed paths: M ext/spl/spl_array.c M ext/spl/spl_directory.c M ext/spl/spl_fixedarray.c M ext/spl/spl_iterators.c Diff: diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 9ba03d2...c9cbe9c 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -599,7 +599,7 @@ static int spl_array_has_dimension_ex(int check_inherited, zval *object, zval *o SEPARATE_ARG_IF_REF(offset); zend_call_method_with_1_params(&object, Z_OBJCE_P(object), &intern->fptr_offset_has, "offsetExists", &rv, offset); zval_ptr_dtor(&offset); - if (rv && zend_is_true(rv TSRMLS_CC)) { + if (rv && zend_is_true(rv)) { zval_ptr_dtor(&rv); return 1; } @@ -620,7 +620,7 @@ static int spl_array_has_dimension_ex(int check_inherited, zval *object, zval *o case 2: return 1; default: - return zend_is_true(*tmp TSRMLS_CC); + return zend_is_true(*tmp); } } } @@ -643,7 +643,7 @@ static int spl_array_has_dimension_ex(int check_inherited, zval *object, zval *o case 2: return 1; default: - return zend_is_true(*tmp TSRMLS_CC); + return zend_is_true(*tmp); } } return 0; diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 8ca8cc0..f289cd6 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -837,7 +837,7 @@ SPL_METHOD(DirectoryIterator, seek) int valid = 0; zend_call_method_with_0_params(&this_ptr, Z_OBJCE_P(getThis()), &intern->u.dir.func_valid, "valid", &retval); if (retval) { - valid = zend_is_true(retval TSRMLS_CC); + valid = zend_is_true(retval); zval_ptr_dtor(&retval); } if (!valid) { @@ -1498,7 +1498,7 @@ SPL_METHOD(RecursiveDirectoryIterator, hasChildren) spl_filesystem_object_get_file_name(intern TSRMLS_CC); if (!allow_links && !(intern->flags & SPL_FILE_DIR_FOLLOW_SYMLINKS)) { php_stat(intern->file_name, intern->file_name_len, FS_IS_LINK, return_value TSRMLS_CC); - if (zend_is_true(return_value TSRMLS_CC)) { + if (zend_is_true(return_value)) { RETURN_FALSE; } } diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index ea91e60..6f808fd 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -511,7 +511,7 @@ static inline int spl_fixedarray_object_has_dimension_helper(spl_fixedarray_obje if (!intern->array->elements[index]) { retval = 0; } else if (check_empty) { - if (zend_is_true(intern->array->elements[index] TSRMLS_CC)) { + if (zend_is_true(intern->array->elements[index])) { retval = 1; } else { retval = 0; @@ -540,7 +540,7 @@ static int spl_fixedarray_object_has_dimension(zval *object, zval *offset, int c zval_ptr_dtor(&intern->retval); MAKE_STD_ZVAL(intern->retval); ZVAL_ZVAL(intern->retval, rv, 1, 1); - return zend_is_true(intern->retval TSRMLS_CC); + return zend_is_true(intern->retval); } return 0; } diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index ee99a25..fab889e 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -249,7 +249,7 @@ next_step: } } if (retval) { - has_children = zend_is_true(retval TSRMLS_CC); + has_children = zend_is_true(retval); zval_ptr_dtor(&retval); if (has_children) { if (object->max_depth == -1 || object->max_depth > object->level) { @@ -1774,7 +1774,7 @@ static inline void spl_filter_it_fetch(zval *zthis, spl_dual_it_object *intern T while (spl_dual_it_fetch(intern, 1 TSRMLS_CC) == SUCCESS) { zend_call_method_with_0_params(&zthis, intern->std.ce, NULL, "accept", &retval); if (retval) { - if (zend_is_true(retval TSRMLS_CC)) { + if (zend_is_true(retval)) { zval_ptr_dtor(&retval); return; } @@ -2600,7 +2600,7 @@ static inline void spl_caching_it_next(spl_dual_it_object *intern TSRMLS_DC) return; } } else { - if (zend_is_true(retval TSRMLS_CC)) { + if (zend_is_true(retval)) { zend_call_method_with_0_params(&intern->inner.zobject, intern->inner.ce, NULL, "getchildren", &zchildren); if (EG(exception)) { if (zchildren) { @@ -3575,7 +3575,7 @@ static int spl_iterator_func_apply(zend_object_iterator *iter, void *puser TSRML apply_info->count++; zend_fcall_info_call(&apply_info->fci, &apply_info->fcc, &retval, NULL TSRMLS_CC); if (retval) { - result = zend_is_true(retval TSRMLS_CC) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_STOP; + result = zend_is_true(retval) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_STOP; zval_ptr_dtor(&retval); } else { result = ZEND_HASH_APPLY_STOP;

« previous php.cvs (#76072) next »