diff options
| author | STANLEY SUFFICOOL <ssufficool@php.net> | 2014-10-24 20:00:48 -0700 |
|---|---|---|
| committer | STANLEY SUFFICOOL <ssufficool@php.net> | 2014-10-24 20:00:48 -0700 |
| commit | e33ba844e52c5dc8e2fb1658a51bec611e78f7ba (patch) | |
| tree | 2e6f416aac4b0a5668976db500ada1bdcc2b399e /Zend/zend_builtin_functions.c | |
| parent | 5f91b0a3c717f109ffb7dc684d5a3fa8905b82ec (diff) | |
| parent | 0a5b7d1316a778dc06a638869c8df8d4c989ddf0 (diff) | |
| download | php-git-e33ba844e52c5dc8e2fb1658a51bec611e78f7ba.tar.gz | |
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (164 commits)
refix the broken place
fix infinite loop
fix datatype mismatch warnings
fix datatype mismatches
fix datatype mismatches
fix datatype mismatches
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warning
fix datatype mismatches
fix datatype mismatch warnings
Re-add phpdbg to travis
Added some NEWS
Make xml valid (missing space between attrs)
Fix info classes file name in xml
Add note about <eval> tag for errors in xml.md
Name the tag <eval> if the error id during ev cmd
Do not print out xml as PHP print...
Fix output to wrong function
...
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) { |