diff options
| author | Anatol Belski <ab@php.net> | 2014-10-24 20:35:28 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-24 20:50:06 +0200 |
| commit | f7d3355e75182f217f7c087f442b2d34e54eab9c (patch) | |
| tree | 1529fab38831a9af36af7b4777f63d7595af74e9 /Zend/zend_builtin_functions.c | |
| parent | 35576ea0ac854803ccbd6ed1631e64c092a562d3 (diff) | |
| download | php-git-f7d3355e75182f217f7c087f442b2d34e54eab9c.tar.gz | |
fix datatype mismatches
and convert len args to size_t where the underlaying API uses zend_string
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 9487bb6c1e..8203d39e51 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1059,7 +1059,7 @@ ZEND_FUNCTION(get_object_vars) } /* }}} */ -static int same_name(const char *key, const char *name, uint32_t name_len) /* {{{ */ +static int same_name(const char *key, const char *name, size_t name_len) /* {{{ */ { char *lcname = zend_str_tolower_dup(name, name_len); int ret = memcmp(lcname, key, name_len) == 0; @@ -1102,7 +1102,7 @@ ZEND_FUNCTION(get_class_methods) zend_check_protected(mptr->common.scope, EG(scope))) || ((mptr->common.fn_flags & ZEND_ACC_PRIVATE) && EG(scope) == mptr->common.scope)))) { - uint len = mptr->common.function_name->len; + size_t len = mptr->common.function_name->len; /* Do not display old-style inherited constructors */ if (!key) { |