Skip to content

Commit f7a7d32

Browse files
nikicnikic
committed
Merge branch 'PHP-7.2' into PHP-7.3
2 parents 24b4462 + 6305119 commit f7a7d32

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎Zend/zend_API.h

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
726726
char *_error = NULL; \
727727
zend_bool _dummy; \
728728
zend_bool _optional = 0; \
729-
int error_code = ZPP_ERROR_OK; \
729+
int _error_code = ZPP_ERROR_OK; \
730730
((void)_i); \
731731
((void)_real_arg); \
732732
((void)_arg); \
@@ -746,7 +746,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
746746
zend_wrong_parameters_count_error(_min_num_args, _max_num_args); \
747747
} \
748748
} \
749-
error_code = ZPP_ERROR_FAILURE; \
749+
_error_code = ZPP_ERROR_FAILURE; \
750750
break; \
751751
} \
752752
_i = 0; \
@@ -764,21 +764,21 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
764764

765765
#define ZEND_PARSE_PARAMETERS_END_EX(failure) \
766766
} while (0); \
767-
if (UNEXPECTED(error_code != ZPP_ERROR_OK)) { \
767+
if (UNEXPECTED(_error_code != ZPP_ERROR_OK)) { \
768768
if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \
769-
if (error_code == ZPP_ERROR_WRONG_CALLBACK) { \
769+
if (_error_code == ZPP_ERROR_WRONG_CALLBACK) { \
770770
if (_flags & ZEND_PARSE_PARAMS_THROW) { \
771771
zend_wrong_callback_exception(_i, _error); \
772772
} else { \
773773
zend_wrong_callback_error(_i, _error); \
774774
} \
775-
} else if (error_code == ZPP_ERROR_WRONG_CLASS) { \
775+
} else if (_error_code == ZPP_ERROR_WRONG_CLASS) { \
776776
if (_flags & ZEND_PARSE_PARAMS_THROW) { \
777777
zend_wrong_parameter_class_exception(_i, _error, _arg); \
778778
} else { \
779779
zend_wrong_parameter_class_error(_i, _error, _arg); \
780780
} \
781-
} else if (error_code == ZPP_ERROR_WRONG_ARG) { \
781+
} else if (_error_code == ZPP_ERROR_WRONG_ARG) { \
782782
if (_flags & ZEND_PARSE_PARAMS_THROW) { \
783783
zend_wrong_parameter_type_exception(_i, _expected_type, _arg); \
784784
} else { \
@@ -818,7 +818,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
818818
Z_PARAM_PROLOGUE(deref, separate); \
819819
if (UNEXPECTED(!zend_parse_arg_array(_arg, &dest, check_null, 0))) { \
820820
_expected_type = Z_EXPECTED_ARRAY; \
821-
error_code = ZPP_ERROR_WRONG_ARG; \
821+
_error_code = ZPP_ERROR_WRONG_ARG; \
822822
break; \
823823
}
824824

@@ -833,7 +833,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
833833
Z_PARAM_PROLOGUE(deref, separate); \
834834
if (UNEXPECTED(!zend_parse_arg_array(_arg, &dest, check_null, 1))) { \
835835
_expected_type = Z_EXPECTED_ARRAY; \
836-
error_code = ZPP_ERROR_WRONG_ARG; \
836+
_error_code = ZPP_ERROR_WRONG_ARG; \
837837
break; \
838838
}
839839

@@ -848,7 +848,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
848848
Z_PARAM_PROLOGUE(deref, separate); \
849849
if (UNEXPECTED(!zend_parse_arg_bool(_arg, &dest, &is_null, check_null))) { \
850850
_expected_type = Z_EXPECTED_BOOL; \
851-
error_code = ZPP_ERROR_WRONG_ARG; \
851+
_error_code = ZPP_ERROR_WRONG_ARG; \
852852
break; \
853853
}
854854

@@ -862,7 +862,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
862862
#define Z_PARAM_CLASS_EX2(dest, check_null, deref, separate) \
863863
Z_PARAM_PROLOGUE(deref, separate); \
864864
if (UNEXPECTED(!zend_parse_arg_class(_arg, &dest, _i, check_null))) { \
865-
error_code = ZPP_ERROR_FAILURE; \
865+
_error_code = ZPP_ERROR_FAILURE; \
866866
break; \
867867
}
868868

@@ -877,7 +877,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
877877
Z_PARAM_PROLOGUE(deref, separate); \
878878
if (UNEXPECTED(!zend_parse_arg_double(_arg, &dest, &is_null, check_null))) { \
879879
_expected_type = Z_EXPECTED_DOUBLE; \
880-
error_code = ZPP_ERROR_WRONG_ARG; \
880+
_error_code = ZPP_ERROR_WRONG_ARG; \
881881
break; \
882882
}
883883

@@ -893,10 +893,10 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
893893
if (UNEXPECTED(!zend_parse_arg_func(_arg, &dest_fci, &dest_fcc, check_null, &_error))) { \
894894
if (!_error) { \
895895
_expected_type = Z_EXPECTED_FUNC; \
896-
error_code = ZPP_ERROR_WRONG_ARG; \
896+
_error_code = ZPP_ERROR_WRONG_ARG; \
897897
break; \
898898
} else { \
899-
error_code = ZPP_ERROR_WRONG_CALLBACK; \
899+
_error_code = ZPP_ERROR_WRONG_CALLBACK; \
900900
break; \
901901
} \
902902
} else if (UNEXPECTED(_error != NULL)) { \
@@ -914,7 +914,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
914914
Z_PARAM_PROLOGUE(deref, separate); \
915915
if (UNEXPECTED(!zend_parse_arg_array_ht(_arg, &dest, check_null, 0, separate))) { \
916916
_expected_type = Z_EXPECTED_ARRAY; \
917-
error_code = ZPP_ERROR_WRONG_ARG; \
917+
_error_code = ZPP_ERROR_WRONG_ARG; \
918918
break; \
919919
}
920920

@@ -929,7 +929,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
929929
Z_PARAM_PROLOGUE(deref, separate); \
930930
if (UNEXPECTED(!zend_parse_arg_array_ht(_arg, &dest, check_null, 1, separate))) { \
931931
_expected_type = Z_EXPECTED_ARRAY; \
932-
error_code = ZPP_ERROR_WRONG_ARG; \
932+
_error_code = ZPP_ERROR_WRONG_ARG; \
933933
break; \
934934
}
935935

@@ -944,7 +944,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
944944
Z_PARAM_PROLOGUE(deref, separate); \
945945
if (UNEXPECTED(!zend_parse_arg_long(_arg, &dest, &is_null, check_null, 0))) { \
946946
_expected_type = Z_EXPECTED_LONG; \
947-
error_code = ZPP_ERROR_WRONG_ARG; \
947+
_error_code = ZPP_ERROR_WRONG_ARG; \
948948
break; \
949949
}
950950

@@ -959,7 +959,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
959959
Z_PARAM_PROLOGUE(deref, separate); \
960960
if (UNEXPECTED(!zend_parse_arg_long(_arg, &dest, &is_null, check_null, 1))) { \
961961
_expected_type = Z_EXPECTED_LONG; \
962-
error_code = ZPP_ERROR_WRONG_ARG; \
962+
_error_code = ZPP_ERROR_WRONG_ARG; \
963963
break; \
964964
}
965965

@@ -974,7 +974,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
974974
Z_PARAM_PROLOGUE(deref, separate); \
975975
if (UNEXPECTED(!zend_parse_arg_object(_arg, &dest, NULL, check_null))) { \
976976
_expected_type = Z_EXPECTED_OBJECT; \
977-
error_code = ZPP_ERROR_WRONG_ARG; \
977+
_error_code = ZPP_ERROR_WRONG_ARG; \
978978
break; \
979979
}
980980

@@ -990,11 +990,11 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
990990
if (UNEXPECTED(!zend_parse_arg_object(_arg, &dest, _ce, check_null))) { \
991991
if (_ce) { \
992992
_error = ZSTR_VAL((_ce)->name); \
993-
error_code = ZPP_ERROR_WRONG_CLASS; \
993+
_error_code = ZPP_ERROR_WRONG_CLASS; \
994994
break; \
995995
} else { \
996996
_expected_type = Z_EXPECTED_OBJECT; \
997-
error_code = ZPP_ERROR_WRONG_ARG; \
997+
_error_code = ZPP_ERROR_WRONG_ARG; \
998998
break; \
999999
} \
10001000
}
@@ -1010,7 +1010,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
10101010
Z_PARAM_PROLOGUE(deref, separate); \
10111011
if (UNEXPECTED(!zend_parse_arg_path(_arg, &dest, &dest_len, check_null))) { \
10121012
_expected_type = Z_EXPECTED_PATH; \
1013-
error_code = ZPP_ERROR_WRONG_ARG; \
1013+
_error_code = ZPP_ERROR_WRONG_ARG; \
10141014
break; \
10151015
}
10161016

@@ -1025,7 +1025,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
10251025
Z_PARAM_PROLOGUE(deref, separate); \
10261026
if (UNEXPECTED(!zend_parse_arg_path_str(_arg, &dest, check_null))) { \
10271027
_expected_type = Z_EXPECTED_PATH; \
1028-
error_code = ZPP_ERROR_WRONG_ARG; \
1028+
_error_code = ZPP_ERROR_WRONG_ARG; \
10291029
break; \
10301030
}
10311031

@@ -1040,7 +1040,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
10401040
Z_PARAM_PROLOGUE(deref, separate); \
10411041
if (UNEXPECTED(!zend_parse_arg_resource(_arg, &dest, check_null))) { \
10421042
_expected_type = Z_EXPECTED_RESOURCE; \
1043-
error_code = ZPP_ERROR_WRONG_ARG; \
1043+
_error_code = ZPP_ERROR_WRONG_ARG; \
10441044
break; \
10451045
}
10461046

@@ -1055,7 +1055,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
10551055
Z_PARAM_PROLOGUE(deref, separate); \
10561056
if (UNEXPECTED(!zend_parse_arg_string(_arg, &dest, &dest_len, check_null))) { \
10571057
_expected_type = Z_EXPECTED_STRING; \
1058-
error_code = ZPP_ERROR_WRONG_ARG; \
1058+
_error_code = ZPP_ERROR_WRONG_ARG; \
10591059
break; \
10601060
}
10611061

@@ -1070,7 +1070,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_exception(int num, cha
10701070
Z_PARAM_PROLOGUE(deref, separate); \
10711071
if (UNEXPECTED(!zend_parse_arg_str(_arg, &dest, check_null))) { \
10721072
_expected_type = Z_EXPECTED_STRING; \
1073-
error_code = ZPP_ERROR_WRONG_ARG; \
1073+
_error_code = ZPP_ERROR_WRONG_ARG; \
10741074
break; \
10751075
}
10761076

0 commit comments

Comments
 (0)