summaryrefslogtreecommitdiff
path: root/Zend/zend_ini.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-10-22 19:58:42 +0200
committerAnatol Belski <ab@php.net>2017-10-23 08:56:57 +0200
commit793ca716fba66d3bee6448615a9a279857c286d5 (patch)
tree8b4e6d349e040c0105007fec4bf7bb758e0c9828 /Zend/zend_ini.c
parent1f93c9837b2da3c8fcb84aaa40747089451769d5 (diff)
downloadphp-git-793ca716fba66d3bee6448615a9a279857c286d5.tar.gz
Fix datatypes and compiler warnings
Switch to size_t Not critical as an unsigned is already used, but fixes a couple of warnings in other areas. Normalize signature It's a function with the usual compare semantics, returning a platform specific at least produces unnecessary warnings elsewhere and is otherwise inappropriate. Fix return value Drop unused var Fix compiler warnings Fix compiler warning Fix var name in arginfo Fix cast
Diffstat (limited to 'Zend/zend_ini.c')
-rw-r--r--Zend/zend_ini.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index b9212d6d8b..f585bba2d2 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -418,7 +418,7 @@ ZEND_API int zend_ini_register_displayer(char *name, uint32_t name_length, void
* Data retrieval
*/
-ZEND_API zend_long zend_ini_long(char *name, uint32_t name_length, int orig) /* {{{ */
+ZEND_API zend_long zend_ini_long(char *name, size_t name_length, int orig) /* {{{ */
{
zend_ini_entry *ini_entry;
@@ -435,7 +435,7 @@ ZEND_API zend_long zend_ini_long(char *name, uint32_t name_length, int orig) /*
}
/* }}} */
-ZEND_API double zend_ini_double(char *name, uint32_t name_length, int orig) /* {{{ */
+ZEND_API double zend_ini_double(char *name, size_t name_length, int orig) /* {{{ */
{
zend_ini_entry *ini_entry;
@@ -452,7 +452,7 @@ ZEND_API double zend_ini_double(char *name, uint32_t name_length, int orig) /* {
}
/* }}} */
-ZEND_API char *zend_ini_string_ex(char *name, uint32_t name_length, int orig, zend_bool *exists) /* {{{ */
+ZEND_API char *zend_ini_string_ex(char *name, size_t name_length, int orig, zend_bool *exists) /* {{{ */
{
zend_ini_entry *ini_entry;
@@ -476,7 +476,7 @@ ZEND_API char *zend_ini_string_ex(char *name, uint32_t name_length, int orig, ze
}
/* }}} */
-ZEND_API char *zend_ini_string(char *name, uint32_t name_length, int orig) /* {{{ */
+ZEND_API char *zend_ini_string(char *name, size_t name_length, int orig) /* {{{ */
{
zend_bool exists = 1;
char *return_value;