clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove casts

Browse Source
This commit is contained in:
Anatol Belski 2017-07-29 06:31:47 +02:00
parent 64c9b5ae12
commit b06caa0e5f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/standard/basic_functions.c
View File

@ -5411,9 +5411,9 @@ PHP_FUNCTION(ini_get_all)
}
/* }}} */
static int php_ini_check_path(char *option_name, int option_len, char *new_option_name, int new_option_len) /* {{{ */
static int php_ini_check_path(char *option_name, size_t option_len, char *new_option_name, size_t new_option_len) /* {{{ */
{
if (option_len != (new_option_len - 1)) {
if (option_len + 1 != new_option_len) {
return 0;
}
@ -5434,7 +5434,7 @@ PHP_FUNCTION(ini_set)
Z_PARAM_STR(new_value)
ZEND_PARSE_PARAMETERS_END();
old_value = zend_ini_string(ZSTR_VAL(varname), (int)ZSTR_LEN(varname), 0);
old_value = zend_ini_string(ZSTR_VAL(varname), ZSTR_LEN(varname), 0);
/* copy to return here, because alter might free it! */
if (old_value) {
@ -5451,7 +5451,7 @@ PHP_FUNCTION(ini_set)
RETVAL_FALSE;
}
#define _CHECK_PATH(var, var_len, ini) php_ini_check_path(var, (int)var_len, ini, sizeof(ini))
#define _CHECK_PATH(var, var_len, ini) php_ini_check_path(var, var_len, ini, sizeof(ini))
/* open basedir check */
if (PG(open_basedir)) {
if (_CHECK_PATH(ZSTR_VAL(varname), ZSTR_LEN(varname), "error_log") ||
@ -5466,6 +5466,7 @@ PHP_FUNCTION(ini_set)
}
}
}
#undef _CHECK_PATH
if (zend_alter_ini_entry_ex(varname, new_value, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0) == FAILURE) {
zval_dtor(return_value);