Re: com php-src: Revert "fix typos "paramer" -> "parameters"": Zend/zend_API.c Zend/zend_API.h
| From: | Xinchen Hui | Date: | Tue, 08 Dec 2015 03:06:20 +0000 |
| Subject: | Re: com php-src: Revert "fix typos "paramer" -> "parameters"": Zend/zend_API.c Zend/zend_API.h | ||
| References: | 1 2 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-90116@lists.php.net to get a copy of this message | ||
Hey:
On Tue, Dec 8, 2015 at 11:00 AM, Yasuo Ohgaki <yohgaki@ohgaki.net> wrote:
> Hi Xinchen,
>
> How about fix typo in master at least?
> Compatibility macro for both branches is OK to me, though.
>
I don't revert it in master
thanks
>
> --
> Yasuo Ohgaki
> yohgaki@ohgaki.net
>
>
> On Tue, Dec 8, 2015 at 11:52 AM, Xinchen Hui <laruence@php.net> wrote:
> > Commit: 0495bf5650995cd8f18d6a9909eb4c5dcefde669
> > Author: Xinchen Hui <laruence@gmail.com> Tue, 8 Dec 2015
> 10:52:50 +0800
> > Parents: 920c088082ec41d23a2ec90c3bd63be1037e5d60
> > Branches: PHP-7.0 master
> >
> > Link:
>
> http://git.php.net/?p=php-src.git;a=commitdiff;h=0495bf5650995cd8f18d6a9909eb4c5dcefde669
> >
> > Log:
> > Revert "fix typos "paramer" -> "parameters""
> >
> > ABI BC break
> >
> > This reverts commit 6ac12f13379f3fc19f07abb9d1055274e5f98838.
> >
> > 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 08040b1..0e6d89f 100644
> > --- a/Zend/zend_API.c
> > +++ b/Zend/zend_API.c
> > @@ -197,7 +197,7 @@ ZEND_API char *zend_zval_type_name(const zval *arg)
> /* {{{ */
> > /* }}} */
> >
> > #ifdef FAST_ZPP
> > -ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_parameters_count_error(int num_args, int min_num_args, int
> max_num_args) /* {{{ */
> > +ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_paramers_count_error(int num_args, int min_num_args, int
> max_num_args) /* {{{ */
> > {
> > zend_function *active_function = EG(current_execute_data)->func;
> > const char *class_name = active_function->common.scope ?
> ZSTR_VAL(active_function->common.scope->name) : "";
> > @@ -213,7 +213,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_parameters_count_error(int num_
> > }
> > /* }}} */
> >
> > -ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_parameter_type_error(int num, zend_expected_type expected_type,
> zval *arg) /* {{{ */
> > +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_type_error(int
> num, zend_expected_type expected_type, zval *arg) /* {{{ */
> > {
> > const char *space;
> > const char *class_name = get_active_class_name(&space);
> > @@ -227,7 +227,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_parameter_type_error(int num, z
> > }
> > /* }}} */
> >
> > -ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_parameter_class_error(int num, char *name, zval *arg) /* {{{ */
> > +ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_paramer_class_error(int num, char *name, zval *arg) /* {{{ */
> > {
> > 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 7b511d1..6f6c391 100644
> > --- a/Zend/zend_API.h
> > +++ b/Zend/zend_API.h
> > @@ -692,9 +692,9 @@ typedef enum _zend_expected_type {
> > Z_EXPECTED_LAST
> > } zend_expected_type;
> >
> > -ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_parameters_count_error(int num_args, int min_num_args, int
> max_num_args);
> > -ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_parameter_type_error(int num, zend_expected_type expected_type,
> zval *arg);
> > -ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_parameter_class_error(int num, char *name, zval *arg);
> > +ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_paramers_count_error(int num_args, int min_num_args, int
> max_num_args);
> > +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_type_error(int
> num, zend_expected_type expected_type, zval *arg);
> > +ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_paramer_class_error(int num, char *name, zval *arg);
> > ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int
> severity, int num, char *error);
> >
> > #define ZPP_ERROR_OK 0
> > @@ -729,7 +729,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_callback_error(int severity, in
> > (UNEXPECTED(_num_args > _max_num_args) && \
> > EXPECTED(_max_num_args >= 0))) { \
> > if (!(_flags & ZEND_PARSE_PARAMS_QUIET))
> { \
> > -
> zend_wrong_parameters_count_error(_num_args, _min_num_args,
> _max_num_args); \
> > +
> zend_wrong_paramers_count_error(_num_args, _min_num_args, _max_num_args); \
> > } \
> > error_code = ZPP_ERROR_FAILURE; \
> > break; \
> > @@ -747,9 +747,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL
> zend_wrong_callback_error(int severity, in
> > if (error_code ==
> ZPP_ERROR_WRONG_CALLBACK) { \
> >
> zend_wrong_callback_error(E_WARNING, _i, _error); \
> > } else if (error_code ==
> ZPP_ERROR_WRONG_CLASS) { \
> > -
> zend_wrong_parameter_class_error(_i, _error, _arg); \
> > +
> zend_wrong_paramer_class_error(_i, _error, _arg); \
> > } else if (error_code ==
> ZPP_ERROR_WRONG_ARG) { \
> > -
> zend_wrong_parameter_type_error(_i, _expected_type, _arg); \
> > +
> zend_wrong_paramer_type_error(_i, _expected_type, _arg); \
> > } \
> > } \
> > failure; \
> >
> >
> > --
> > PHP CVS Mailing List (http://www.php.net/)
> > To unsubscribe, visit: http://www.php.net/unsub.php
> >
>
--
Xinchen Hui
@Laruence
http://www.laruence.com/