archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

adjust signature and remove casts

Browse source
This commit is contained in:
Anatol Belski 2017-07-28 15:07:09 +02:00
parent 0d1eeeb68d
commit 7b34fae703
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
main/main.c
View file

@ -310,7 +310,7 @@ static PHP_INI_MH(OnUpdateTimeout)
/* {{{ php_get_display_errors_mode() helper function /* {{{ php_get_display_errors_mode() helper function
*/ */
static int php_get_display_errors_mode(char *value, int value_length) static int php_get_display_errors_mode(char *value, size_t value_length)
{ {
int mode; int mode;
@ -343,7 +343,7 @@ static int php_get_display_errors_mode(char *value, int value_length)
*/ */
static PHP_INI_MH(OnUpdateDisplayErrors) static PHP_INI_MH(OnUpdateDisplayErrors)
{ {
PG(display_errors) = (zend_bool) php_get_display_errors_mode(ZSTR_VAL(new_value), (int)ZSTR_LEN(new_value)); PG(display_errors) = (zend_bool) php_get_display_errors_mode(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
return SUCCESS; return SUCCESS;
} }
@ -353,15 +353,16 @@ static PHP_INI_MH(OnUpdateDisplayErrors)
*/ */
static PHP_INI_DISP(display_errors_mode) static PHP_INI_DISP(display_errors_mode)
{ {
int mode, tmp_value_length, cgi_or_cli; int mode, cgi_or_cli;
size_t tmp_value_length;
char *tmp_value; char *tmp_value;
if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) { if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
tmp_value = (ini_entry->orig_value ? ZSTR_VAL(ini_entry->orig_value) : NULL ); tmp_value = (ini_entry->orig_value ? ZSTR_VAL(ini_entry->orig_value) : NULL );
tmp_value_length = (int)(ini_entry->orig_value? ZSTR_LEN(ini_entry->orig_value) : 0); tmp_value_length = (ini_entry->orig_value? ZSTR_LEN(ini_entry->orig_value) : 0);
} else if (ini_entry->value) { } else if (ini_entry->value) {
tmp_value = ZSTR_VAL(ini_entry->value); tmp_value = ZSTR_VAL(ini_entry->value);
tmp_value_length = (int)ZSTR_LEN(ini_entry->value); tmp_value_length = ZSTR_LEN(ini_entry->value);
} else { } else {
tmp_value = NULL; tmp_value = NULL;
tmp_value_length = 0; tmp_value_length = 0;