diff options
| author | Zeev Suraski <zeev@php.net> | 2001-01-07 18:39:11 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-01-07 18:39:11 +0000 |
| commit | 903018ef368754bace78ab341cb2eb5e6628bcf1 (patch) | |
| tree | 3884adafa0f7b560891e5bffecae0ed134b6f922 /Zend/zend_ini.c | |
| parent | 7235542ceea62856d6cfd1adab9d90e271b08cd5 (diff) | |
| download | php-git-903018ef368754bace78ab341cb2eb5e6628bcf1.tar.gz | |
- Remove backward dependency from PHP -> Zend
- Rename get_ini_entry() as get_configuration_directive() for clarity
(it doesn't use the INI subsystem, but the module-supplied function for
retrieving configuration directives)
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 06fc41d45f..62820d9698 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -130,7 +130,7 @@ ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_num { zend_ini_entry *p = ini_entry; zend_ini_entry *hashed_ini_entry; - zval *default_value; + zval default_value; while (p->name) { p->module_number = module_number; @@ -138,11 +138,11 @@ ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_num zend_unregister_ini_entries(module_number); return FAILURE; } - if ((default_value=cfg_get_entry(p->name, p->name_length))) { + if ((zend_get_configuration_directive(p->name, p->name_length, &default_value))) { if (!hashed_ini_entry->on_modify - || hashed_ini_entry->on_modify(hashed_ini_entry, default_value->value.str.val, default_value->value.str.len, hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP)==SUCCESS) { - hashed_ini_entry->value = default_value->value.str.val; - hashed_ini_entry->value_length = default_value->value.str.len; + || hashed_ini_entry->on_modify(hashed_ini_entry, default_value.value.str.val, default_value.value.str.len, hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP)==SUCCESS) { + hashed_ini_entry->value = default_value.value.str.val; + hashed_ini_entry->value_length = default_value.value.str.len; } } else { if (hashed_ini_entry->on_modify) { |