diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-18 19:18:11 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-18 19:18:11 +0400 |
| commit | 7652a977a88b825f66959e91a7c8c54b720a50bc (patch) | |
| tree | 5285e86c91ccbf5d6cb708a13c443f5be6a806b6 /ext/standard/formatted_print.c | |
| parent | ea2e1bb1eb7dd0ca1ce6d731190b2a6b2046a645 (diff) | |
| download | php-git-7652a977a88b825f66959e91a7c8c54b720a50bc.tar.gz | |
Use ZEND_FETCH_FOREACH_* macros to iterate over HashTables instead of zend_hash_move_forward() and family.
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; } |