archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clean up some type conversions

Browse source 
While at it also fix some type checks in iconv and drop dead and
unported code in standard/filters.
This commit is contained in:
Nikita Popov 2015-04-25 20:43:11 +02:00
parent 1800bed104
commit 40e465e357
11 changed files with 65 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

12
main/php_ini.c
View file

@ -886,15 +886,13 @@ PHPAPI zval *cfg_get_entry(const char *name, size_t name_length)
*/
PHPAPI int cfg_get_long(const char *varname, zend_long *result)
{
zval *tmp, var;
zval *tmp;
if ((tmp = zend_hash_str_find(&configuration_hash, varname, strlen(varname))) == NULL) {
*result = 0;
return FAILURE;
}
ZVAL_DUP(&var, tmp);
convert_to_long(&var);
*result = Z_LVAL(var);
*result = zval_get_long(tmp);
return SUCCESS;
}
/* }}} */
@ -903,15 +901,13 @@ PHPAPI int cfg_get_long(const char *varname, zend_long *result)
*/
PHPAPI int cfg_get_double(const char *varname, double *result)
{
zval *tmp, var;
zval *tmp;
if ((tmp = zend_hash_str_find(&configuration_hash, varname, strlen(varname))) == NULL) {
*result = (double) 0;
return FAILURE;
}
ZVAL_DUP(&var, tmp);
convert_to_double(&var);
*result = Z_DVAL(var);
*result = zval_get_double(tmp);
return SUCCESS;
}
/* }}} */