com php-src: Style cleanup, as well as fixing bug with missing argument for WRONG_PARAM_COUNT_WITH_RETVAL: Zend/zend_API.c Zend/zend_API.h
| From: | Dmitry Stogov | Date: | Wed, 18 Mar 2015 19:45:16 +0000 |
| Subject: | com php-src: Style cleanup, as well as fixing bug with missing argument for WRONG_PARAM_COUNT_WITH_RETVAL: Zend/zend_API.c Zend/zend_API.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85704@lists.php.net to get a copy of this message | ||
Commit: 579e7fa457a7596fda24f43c64176406d91ed226
Author: Anthony Ferrara <ircmaxell@gmail.com> Wed, 18 Mar 2015 15:45:16 -0400
Parents: 8be4266f6a8e811a11c9328bd30ca0ea34603c78
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=579e7fa457a7596fda24f43c64176406d91ed226
Log:
Style cleanup, as well as fixing bug with missing argument for WRONG_PARAM_COUNT_WITH_RETVAL
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 0248f87..da0eca8 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -157,6 +157,7 @@ ZEND_API void zend_wrong_param_count(void) /* {{{ */
zend_wrong_param_count_ex(0);
}
}
+/* }}} */
ZEND_API void zend_wrong_param_count_ex(zend_bool strict) /* {{{ */
{
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 8a70427..a1989d1 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -356,10 +356,10 @@ ZEND_API char *zend_get_type_by_const(int type);
#define ZEND_IS_METHOD_CALL() (EX(func)->common.scope != NULL)
#define WRONG_PARAM_COUNT ZEND_WRONG_PARAM_COUNT()
-#define WRONG_PARAM_COUNT_WITH_RETVAL(ret) ZEND_WRONG_PARAM_COUNT_WITH_RETVAL()
+#define WRONG_PARAM_COUNT_WITH_RETVAL(ret) ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret)
#define ARG_COUNT(dummy) EX_NUM_ARGS()
#define ZEND_NUM_ARGS() EX_NUM_ARGS()
-#define ZEND_WRONG_PARAM_COUNT() { zend_wrong_param_count(); return; }
+#define ZEND_WRONG_PARAM_COUNT() { zend_wrong_param_count(); return; }
#define ZEND_WRONG_PARAM_COUNT_WITH_RETVAL(ret) { zend_wrong_param_count(); return ret; }
#ifndef ZEND_WIN32