Re: com php-src: fix typos "paramer" -> "parameters": Zend/zend_API.c Zend/zend_API.h

From: Date: Tue, 08 Dec 2015 02:56:07 +0000
Subject: Re: com php-src: 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-90114@lists.php.net to get a copy of this message
Hey: On Tue, Dec 8, 2015 at 5:28 AM, Matt Wilmas <php_lists@realplain.com> wrote: > Hi Xinchen, > > Thanks for changing this! I was going to with my param parsing changes if > I had been sooner, but maybe shortening to "param" and "params." I was > going to say something separately, but didn't want to nitpick. :-) Then I > wondered if changing it after 7.0.0 would be incompatible... > yeah, we was talking about this last night. I've reverted this. thanks > > > BTW, speaking of spelling, I've noticed your use of "okey" in tests, etc. > instead of "okay" :-) Although, for tests anyway, the shorter "OK" would > be better. Hmm... well! Nevermind my "correction": > https://en.wikipedia.org/wiki/OK#Spelling_variations :-O > > > - Matt > > > > ----- Original Message ----- > From: "Xinchen Hui" > Sent: Monday, December 07, 2015 > > Commit: 6ac12f13379f3fc19f07abb9d1055274e5f98838 > Author: Márcio Almada <marcio3w@gmail.com> Mon, 7 Dec 2015 > 01:56:21 -0400 > Committer: Xinchen Hui <laruence@gmail.com> Mon, 7 Dec 2015 14:48:26 > +0800 > Parents: e48988311d2e726eeeb25ebbbde42146c0f53b48 > Branches: PHP-7.0 master > > Link: > > http://git.php.net/?p=php-src.git;a=commitdiff;h=6ac12f13379f3fc19f07abb9d1055274e5f98838 > > Log: > fix typos "paramer" -> "parameters" > > 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 0e6d89f..08040b1 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_paramers_count_error(int > num_args, int min_num_args, int max_num_args) /* {{{ */ > +ZEND_API ZEND_COLD void ZEND_FASTCALL > zend_wrong_parameters_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_paramers_count_error(int num_ar > } > /* }}} */ > > -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_parameter_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_paramer_type_error(int num, zen > } > /* }}} */ > > -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_parameter_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 6f6c391..7b511d1 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_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_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_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_paramers_count_error(_num_args, _min_num_args, > _max_num_args); \ > + zend_wrong_parameters_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_paramer_class_error(_i, _error, _arg); \ > + zend_wrong_parameter_class_error(_i, _error, _arg); \ > } else if (error_code == ZPP_ERROR_WRONG_ARG) { \ > - zend_wrong_paramer_type_error(_i, _expected_type, _arg); \ > + zend_wrong_parameter_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/

« previous php.cvs (#90114) next »