com php-src: Prefix zend_wrong_param_count with _ to discourage use: Zend/zend_API.c Zend/zend _API.h

From: Date: Tue, 10 Feb 2015 15:48:07 +0000
Subject: com php-src: Prefix zend_wrong_param_count with _ to discourage use: Zend/zend_API.c Zend/zend _API.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85723@lists.php.net to get a copy of this message
Commit: 86b0685f55fe72590296acae056f996bc951a461 Author: Andrea Faulds <ajf@ajf.me> Sun, 25 Jan 2015 02:22:28 +0000 Parents: 2985944a8af96ec5b81c7d7b9288d06a829e6435 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=86b0685f55fe72590296acae056f996bc951a461 Log: Prefix zend_wrong_param_count with _ to discourage use Changed paths: M Zend/zend_API.c M Zend/zend_API.h Diff: diff --git a/Zend/zend_API.c b/Zend/zend_API.c index e055a63..22fb42d 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -149,7 +149,7 @@ ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array) / } /* }}} */ -ZEND_API void zend_wrong_param_count(zend_bool strict) /* {{{ */ +ZEND_API void _zend_wrong_param_count(zend_bool strict) /* {{{ */ { const char *space; const char *class_name = get_active_class_name(&space); diff --git a/Zend/zend_API.h b/Zend/zend_API.h index f0270d0..0855f81 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -295,7 +295,7 @@ ZEND_API int zend_register_class_alias_ex(const char *name, size_t name_len, zen ZEND_API int zend_disable_function(char *function_name, size_t function_name_length); ZEND_API int zend_disable_class(char *class_name, size_t class_name_length); -ZEND_API void zend_wrong_param_count(zend_bool strict); +ZEND_API void _zend_wrong_param_count(zend_bool strict); #define IS_CALLABLE_CHECK_SYNTAX_ONLY (1<<0) #define IS_CALLABLE_CHECK_NO_ACCESS (1<<1) @@ -357,8 +357,8 @@ ZEND_API char *zend_get_type_by_const(int type); #define WRONG_PARAM_COUNT_WITH_RETVAL(ret) ZEND_WRONG_PARAM_COUNT_WITH_RETVAL((ZEND_CALL_INFO(EG(current_execute_data)) & ZEND_CALL_STRICT_TYPEHINTS) ? 1 : 0, ret) #define ARG_COUNT(dummy) EX_NUM_ARGS() #define ZEND_NUM_ARGS() EX_NUM_ARGS() -#define ZEND_WRONG_PARAM_COUNT(strict) { zend_wrong_param_count(strict); return; } -#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(strict, ret) { zend_wrong_param_count(strict); return ret; } +#define ZEND_WRONG_PARAM_COUNT(strict) { _zend_wrong_param_count(strict); return; } +#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(strict, ret) { _zend_wrong_param_count(strict); return ret; } #ifndef ZEND_WIN32 #define DLEXPORT

« previous php.cvs (#85723) next »