diff options
| author | Nikita Popov <nikic@php.net> | 2015-04-25 20:43:11 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-04-27 18:50:08 +0200 |
| commit | 40e465e3575443757693146bb141a4de02cc697c (patch) | |
| tree | 6eb7c1fc0ffeb24d3bcf3cc34ecd294c39a2e4e4 /main/php_ini.c | |
| parent | 1800bed1045a43d2478c0265a26fe0675fb5a6c1 (diff) | |
| download | php-git-40e465e3575443757693146bb141a4de02cc697c.tar.gz | |
Clean up some type conversions
While at it also fix some type checks in iconv and drop dead and
unported code in standard/filters.
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 7914244147..80d34848f8 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -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; } /* }}} */ |