Skip to content

Commit 86dea69

Browse files
committed
Merge branch 'typo/paramer' of https://github.com/marcioAlmada/php-src
2 parents 8e14632 + 2dcfd8d commit 86dea69

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Zend/zend_API.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ ZEND_API char *zend_zval_type_name(const zval *arg) /* {{{ */
199199
/* }}} */
200200

201201
#ifdef FAST_ZPP
202-
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramers_count_error(int num_args, int min_num_args, int max_num_args) /* {{{ */
202+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameters_count_error(int num_args, int min_num_args, int max_num_args) /* {{{ */
203203
{
204204
zend_function *active_function = EG(current_execute_data)->func;
205205
const char *class_name = active_function->common.scope ? ZSTR_VAL(active_function->common.scope->name) : "";
@@ -215,7 +215,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramers_count_error(int num_ar
215215
}
216216
/* }}} */
217217

218-
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_type_error(int num, zend_expected_type expected_type, zval *arg) /* {{{ */
218+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(int num, zend_expected_type expected_type, zval *arg) /* {{{ */
219219
{
220220
const char *space;
221221
const char *class_name = get_active_class_name(&space);
@@ -229,7 +229,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_type_error(int num, zen
229229
}
230230
/* }}} */
231231

232-
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_class_error(int num, char *name, zval *arg) /* {{{ */
232+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num, char *name, zval *arg) /* {{{ */
233233
{
234234
const char *space;
235235
const char *class_name = get_active_class_name(&space);

Zend/zend_API.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -692,9 +692,9 @@ typedef enum _zend_expected_type {
692692
Z_EXPECTED_LAST
693693
} zend_expected_type;
694694

695-
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramers_count_error(int num_args, int min_num_args, int max_num_args);
696-
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_type_error(int num, zend_expected_type expected_type, zval *arg);
697-
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_paramer_class_error(int num, char *name, zval *arg);
695+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameters_count_error(int num_args, int min_num_args, int max_num_args);
696+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(int num, zend_expected_type expected_type, zval *arg);
697+
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(int num, char *name, zval *arg);
698698
ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int severity, int num, char *error);
699699

700700
#define ZPP_ERROR_OK 0
@@ -729,7 +729,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int severity, in
729729
(UNEXPECTED(_num_args > _max_num_args) && \
730730
EXPECTED(_max_num_args >= 0))) { \
731731
if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \
732-
zend_wrong_paramers_count_error(_num_args, _min_num_args, _max_num_args); \
732+
zend_wrong_parameters_count_error(_num_args, _min_num_args, _max_num_args); \
733733
} \
734734
error_code = ZPP_ERROR_FAILURE; \
735735
break; \
@@ -747,9 +747,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_error(int severity, in
747747
if (error_code == ZPP_ERROR_WRONG_CALLBACK) { \
748748
zend_wrong_callback_error(E_WARNING, _i, _error); \
749749
} else if (error_code == ZPP_ERROR_WRONG_CLASS) { \
750-
zend_wrong_paramer_class_error(_i, _error, _arg); \
750+
zend_wrong_parameter_class_error(_i, _error, _arg); \
751751
} else if (error_code == ZPP_ERROR_WRONG_ARG) { \
752-
zend_wrong_paramer_type_error(_i, _expected_type, _arg); \
752+
zend_wrong_parameter_type_error(_i, _expected_type, _arg); \
753753
} \
754754
} \
755755
failure; \

0 commit comments

Comments
 (0)