com php-src: remove casts: ext/standard/basic_functions.c
| From: | Anatol Belski | Date: | Sun, 30 Jul 2017 16:23:34 +0000 |
| Subject: | com php-src: remove casts: ext/standard/basic_functions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98873@lists.php.net to get a copy of this message | ||
Commit: b06caa0e5f7edf0272af3de6ffcf1443ae12b0be
Author: Anatol Belski <ab@php.net> Sat, 29 Jul 2017 06:31:47 +0200
Parents: 64c9b5ae12d2d8001f2f798fcb0b3f20901c4ada
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b06caa0e5f7edf0272af3de6ffcf1443ae12b0be
Log:
remove casts
Changed paths:
M ext/standard/basic_functions.c
Diff:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 949f8ad..76fc2ef 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -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);