diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-02-10 15:43:12 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-02-10 15:43:12 +0300 |
| commit | 1eb4352143e42784a59b55e0e531a8faecc0033d (patch) | |
| tree | 404ae11471af991680685889d292ca120aa76095 /main/php_ini.c | |
| parent | 4a875e18fdebfe3af530a6c4367d893c1cb811ae (diff) | |
| download | php-git-1eb4352143e42784a59b55e0e531a8faecc0033d.tar.gz | |
Use new ZEND_HASH_FOREACH_... API.
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 5703d1fc0d..9c16aa327d 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -782,16 +782,11 @@ PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int { zend_string *str; zval *data; - zend_ulong num_index; /* Walk through config hash and alter matching ini entries using the values found in the hash */ - for (zend_hash_internal_pointer_reset(source_hash); - zend_hash_get_current_key(source_hash, &str, &num_index) == HASH_KEY_IS_STRING; - zend_hash_move_forward(source_hash) - ) { - data = zend_hash_get_current_data(source_hash); + ZEND_HASH_FOREACH_STR_KEY_VAL(source_hash, str, data) { zend_alter_ini_entry_ex(str, Z_STR_P(data), modify_type, stage, 0); - } + } ZEND_HASH_FOREACH_END(); } /* }}} */ |