diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-21 14:14:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-21 14:14:00 +0800 |
| commit | e48b9ad197b4ec6ac72e75538453cc350d0a41f4 (patch) | |
| tree | f5ded37abc65e64e270b6f1ac264db9bc603f949 /ext/standard/formatted_print.c | |
| parent | cf7e703813e065fec7a8a5caa7aff4b70d3455b8 (diff) | |
| parent | 54d9ad53f4797733b41bf2c65bd2c2cb5a1938b6 (diff) | |
| download | php-git-e48b9ad197b4ec6ac72e75538453cc350d0a41f4.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'ext/standard/formatted_print.c')
| -rw-r--r-- | ext/standard/formatted_print.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index 2e6e2f672b..622fbfbb3f 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -404,12 +404,10 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC) newargs = (zval *)safe_emalloc(argc, sizeof(zval), 0); ZVAL_COPY_VALUE(&newargs[0], z_format); - for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(array)); - (zv = zend_hash_get_current_data(Z_ARRVAL_P(array))) != NULL; - zend_hash_move_forward(Z_ARRVAL_P(array))) { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(array), zv) { ZVAL_COPY_VALUE(&newargs[i], zv); i++; - } + } ZEND_HASH_FOREACH_END(); args = newargs; format_offset = 0; } |