diff options
| author | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-25 19:24:55 +0200 |
| commit | c3e3c98ec666812daaaca896cf5ef758a8a6df14 (patch) | |
| tree | d82a76de5c8d117d1cf2dcca19bb30a283621870 /Zend/zend_ini.c | |
| parent | 0cf2dbdf58645b52cb6582b1b2571c5cd9e9e6b3 (diff) | |
| download | php-git-c3e3c98ec666812daaaca896cf5ef758a8a6df14.tar.gz | |
master renames phase 1
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 52585005b9..1f07ac3d56 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -208,9 +208,9 @@ ZEND_API int zend_register_ini_entries(const zend_ini_entry *ini_entry, int modu hashed_ini_entry->module_number = module_number; 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, Z_STRVAL(default_value), Z_STRSIZE(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->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_STRSIZE(default_value); + hashed_ini_entry->value_length = Z_STRLEN(default_value); config_directive_success = 1; } } @@ -352,7 +352,7 @@ ZEND_API int zend_ini_register_displayer(char *name, uint name_length, void (*di * Data retrieval */ -ZEND_API zend_int_t zend_ini_int(char *name, uint name_length, int orig) /* {{{ */ +ZEND_API zend_long zend_ini_long(char *name, uint name_length, int orig) /* {{{ */ { zend_ini_entry *ini_entry; TSRMLS_FETCH(); @@ -587,7 +587,7 @@ ZEND_API ZEND_INI_MH(OnUpdateBool) /* {{{ */ ZEND_API ZEND_INI_MH(OnUpdateLong) /* {{{ */ { - zend_int_t *p; + zend_long *p; #ifndef ZTS char *base = (char *) mh_arg2; #else @@ -596,7 +596,7 @@ ZEND_API ZEND_INI_MH(OnUpdateLong) /* {{{ */ base = (char *) ts_resource(*((int *) mh_arg2)); #endif - p = (zend_int_t *) (base+(size_t) mh_arg1); + p = (zend_long *) (base+(size_t) mh_arg1); *p = zend_atol(new_value, new_value_length); return SUCCESS; @@ -605,7 +605,7 @@ ZEND_API ZEND_INI_MH(OnUpdateLong) /* {{{ */ ZEND_API ZEND_INI_MH(OnUpdateLongGEZero) /* {{{ */ { - zend_int_t *p, tmp; + zend_long *p, tmp; #ifndef ZTS char *base = (char *) mh_arg2; #else @@ -619,7 +619,7 @@ ZEND_API ZEND_INI_MH(OnUpdateLongGEZero) /* {{{ */ return FAILURE; } - p = (zend_int_t *) (base+(size_t) mh_arg1); + p = (zend_long *) (base+(size_t) mh_arg1); *p = tmp; return SUCCESS; |