com php-src: fix datatype mismatches: Zend/zend_API.c Zen d/zend_API.h Zend/zend_builtin_functions.c

Commit: f7d3355e75182f217f7c087f442b2d34e54eab9c Author: Anatol Belski <ab@php.net> Fri, 24 Oct 2014 20:35:28 +0200 Parents: 35576ea0ac854803ccbd6ed1631e64c092a562d3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f7d3355e75182f217f7c087f442b2d34e54eab9c Log: fix datatype mismatches and convert len args to size_t where the underlaying API uses zend_string Changed paths: M Zend/zend_API.c M Zend/zend_API.h M Zend/zend_builtin_functions.c Diff: diff --git a/Zend/zend_API.c b/Zend/zend_API.c index e9de435..c6b34e0 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2699,7 +2699,7 @@ ZEND_API zend_class_entry *zend_register_internal_interface(zend_class_entry *or } /* }}} */ -ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC) /* {{{ */ +ZEND_API int zend_register_class_alias_ex(const char *name, size_t name_len, zend_class_entry *ce TSRMLS_DC) /* {{{ */ { zend_string *lcname; @@ -2759,7 +2759,7 @@ static zend_function_entry disabled_function[] = { ZEND_FE_END }; -ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC) /* {{{ */ +ZEND_API int zend_disable_function(char *function_name, size_t function_name_length TSRMLS_DC) /* {{{ */ { int ret; @@ -2792,7 +2792,7 @@ static const zend_function_entry disabled_class_new[] = { ZEND_FE_END }; -ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC) /* {{{ */ +ZEND_API int zend_disable_class(char *class_name, size_t class_name_length TSRMLS_DC) /* {{{ */ { zend_class_entry *disabled_class; zend_string *key; diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 478f245..46e284b 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -276,15 +276,15 @@ ZEND_API zend_class_entry *zend_register_internal_class_ex(zend_class_entry *cla ZEND_API zend_class_entry *zend_register_internal_interface(zend_class_entry *orig_class_entry TSRMLS_DC); ZEND_API void zend_class_implements(zend_class_entry *class_entry TSRMLS_DC, int num_interfaces, ...); -ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_class_entry *ce TSRMLS_DC); +ZEND_API int zend_register_class_alias_ex(const char *name, size_t name_len, zend_class_entry *ce TSRMLS_DC); #define zend_register_class_alias(name, ce) \ zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_CC) #define zend_register_ns_class_alias(ns, name, ce) \ zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_CC) -ZEND_API int zend_disable_function(char *function_name, uint function_name_length TSRMLS_DC); -ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_DC); +ZEND_API int zend_disable_function(char *function_name, size_t function_name_length TSRMLS_DC); +ZEND_API int zend_disable_class(char *class_name, size_t class_name_length TSRMLS_DC); ZEND_API void zend_wrong_param_count(TSRMLS_D); diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 9487bb6..8203d39 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) {