diff options
| author | Jani Taskinen <jani@php.net> | 2007-09-27 16:44:27 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-09-27 16:44:27 +0000 |
| commit | 72e77213938d25b16a6e6bd0192489a712b46eaa (patch) | |
| tree | c447c001dcced7087bc415435e1016d3bceba445 /Zend/zend_ini.c | |
| parent | 7668572e26b1b6f5f2c6577e733b93fbf2e25710 (diff) | |
| download | php-git-72e77213938d25b16a6e6bd0192489a712b46eaa.tar.gz | |
MFH: missing folding tag + use Z_STR* macros
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index a7ce691f95..f40d51ff95 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -195,9 +195,9 @@ ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_num } if ((zend_get_configuration_directive(p->name, p->name_length, &default_value)) == SUCCESS) { 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 TSRMLS_CC) == 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, Z_STRVAL(default_value), Z_STRLEN(default_value), hashed_ini_entry->mh_arg1, hashed_ini_entry->mh_arg2, hashed_ini_entry->mh_arg3, ZEND_INI_STAGE_STARTUP TSRMLS_CC) == SUCCESS) { + hashed_ini_entry->value = Z_STRVAL(default_value); + hashed_ini_entry->value_length = Z_STRLEN(default_value); config_directive_success = 1; } } @@ -549,8 +549,9 @@ ZEND_API ZEND_INI_MH(OnUpdateLong) /* {{{ */ *p = zend_atoi(new_value, new_value_length); return SUCCESS; } +/* }}} */ -ZEND_API ZEND_INI_MH(OnUpdateLongGEZero) +ZEND_API ZEND_INI_MH(OnUpdateLongGEZero) /* {{{ */ { long *p, tmp; #ifndef ZTS |