Skip to content

Commit 4008704

Browse files
cmb69cmb69
committed
zend_parse_parameters_throw() is obsolete
Since `zend_parse_parameters()` throws now, there is no reason to explicitly call `zend_parse_parameters_throw()` anymore, and since both have actually the same implementation, we redefine the latter as macro.
1 parent 2204dbd commit 4008704

25 files changed

+116
-129
lines changed

‎Zend/zend_API.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -930,20 +930,6 @@ ZEND_API int zend_parse_parameters(int num_args, const char *type_spec, ...) /*
930930
}
931931
/* }}} */
932932

933-
ZEND_API int zend_parse_parameters_throw(int num_args, const char *type_spec, ...) /* {{{ */
934-
{
935-
va_list va;
936-
int retval;
937-
int flags = 0;
938-
939-
va_start(va, type_spec);
940-
retval = zend_parse_va_args(num_args, type_spec, &va, flags);
941-
va_end(va);
942-
943-
return retval;
944-
}
945-
/* }}} */
946-
947933
ZEND_API int zend_parse_method_parameters(int num_args, zval *this_ptr, const char *type_spec, ...) /* {{{ */
948934
{
949935
va_list va;

‎Zend/zend_API.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ ZEND_API int zend_copy_parameters_array(int param_count, zval *argument_array);
258258
#define ZEND_PARSE_PARAMS_QUIET (1<<1)
259259
ZEND_API int zend_parse_parameters(int num_args, const char *type_spec, ...);
260260
ZEND_API int zend_parse_parameters_ex(int flags, int num_args, const char *type_spec, ...);
261-
ZEND_API int zend_parse_parameters_throw(int num_args, const char *type_spec, ...);
261+
#define zend_parse_parameters_throw(num_args, type_spec, ...) \
262+
zend_parse_parameters(num_args, type_spec, __VA_ARGS__)
262263
ZEND_API const char *zend_zval_type_name(const zval *arg);
263264
ZEND_API zend_string *zend_zval_get_type(const zval *arg);
264265

‎ext/dom/attr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ PHP_METHOD(domattr, __construct)
5757
char *name, *value = NULL;
5858
size_t name_len, value_len, name_valid;
5959

60-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s|s", &name, &name_len, &value, &value_len) == FAILURE) {
60+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s", &name, &name_len, &value, &value_len) == FAILURE) {
6161
return;
6262
}
6363

‎ext/dom/cdatasection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ PHP_METHOD(domcdatasection, __construct)
5050
char *value = NULL;
5151
size_t value_len;
5252

53-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s", &value, &value_len) == FAILURE) {
53+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &value, &value_len) == FAILURE) {
5454
return;
5555
}
5656

‎ext/dom/comment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ PHP_METHOD(domcomment, __construct)
5050
char *value = NULL;
5151
size_t value_len;
5252

53-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|s", &value, &value_len) == FAILURE) {
53+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &value, &value_len) == FAILURE) {
5454
return;
5555
}
5656

‎ext/dom/document.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1262,7 +1262,7 @@ PHP_METHOD(domdocument, __construct)
12621262
size_t encoding_len = 0, version_len = 0;
12631263
int refcount;
12641264

1265-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|ss", &version, &version_len, &encoding, &encoding_len) == FAILURE) {
1265+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ss", &version, &version_len, &encoding, &encoding_len) == FAILURE) {
12661266
return;
12671267
}
12681268

‎ext/dom/element.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ PHP_METHOD(domelement, __construct)
158158
int name_valid;
159159
xmlNsPtr nsptr = NULL;
160160

161-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s|s!s", &name, &name_len, &value, &value_len, &uri, &uri_len) == FAILURE) {
161+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!s", &name, &name_len, &value, &value_len, &uri, &uri_len) == FAILURE) {
162162
return;
163163
}
164164

‎ext/dom/entityreference.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ PHP_METHOD(domentityreference, __construct)
5050
char *name;
5151
size_t name_len, name_valid;
5252

53-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
53+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
5454
return;
5555
}
5656

‎ext/dom/processinginstruction.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ PHP_METHOD(domprocessinginstruction, __construct)
5252
size_t name_len, value_len;
5353
int name_valid;
5454

55-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s|s", &name, &name_len, &value, &value_len) == FAILURE) {
55+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s", &name, &name_len, &value, &value_len) == FAILURE) {
5656
return;
5757
}
5858

‎ext/dom/text.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ PHP_METHOD(domtext, __construct)
6060
char *value = NULL;
6161
size_t value_len;
6262

63-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|s", &value, &value_len) == FAILURE) {
63+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &value, &value_len) == FAILURE) {
6464
return;
6565
}
6666

‎ext/dom/xpath.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ PHP_METHOD(domxpath, __construct)
256256
dom_xpath_object *intern;
257257
xmlXPathContextPtr ctx, oldctx;
258258

259-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "O|b", &doc, dom_document_class_entry, &register_node_ns) == FAILURE) {
259+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|b", &doc, dom_document_class_entry, &register_node_ns) == FAILURE) {
260260
return;
261261
}
262262

‎ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static void _php_intlrbbi_constructor_body(INTERNAL_FUNCTION_PARAMETERS)
3939
UErrorCode status = U_ZERO_ERROR;
4040
intl_error_reset(NULL);
4141

42-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s|b",
42+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|b",
4343
&rules, &rules_len, &compiled) == FAILURE) {
4444
return;
4545
}

‎ext/intl/converter/converter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ static PHP_METHOD(UConverter, __construct) {
569569

570570
intl_error_reset(NULL);
571571

572-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|s!s!", &dest, &dest_len, &src, &src_len) == FAILURE) {
572+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!", &dest, &dest_len, &src, &src_len) == FAILURE) {
573573
return;
574574
}
575575

‎ext/phar/phar_object.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,11 +1145,11 @@ PHP_METHOD(Phar, __construct)
11451145
is_data = instanceof_function(Z_OBJCE_P(zobj), phar_ce_data);
11461146

11471147
if (is_data) {
1148-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "p|ls!l", &fname, &fname_len, &flags, &alias, &alias_len, &format) == FAILURE) {
1148+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|ls!l", &fname, &fname_len, &flags, &alias, &alias_len, &format) == FAILURE) {
11491149
return;
11501150
}
11511151
} else {
1152-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "p|ls!", &fname, &fname_len, &flags, &alias, &alias_len) == FAILURE) {
1152+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|ls!", &fname, &fname_len, &flags, &alias, &alias_len) == FAILURE) {
11531153
return;
11541154
}
11551155
}
@@ -4479,7 +4479,7 @@ PHP_METHOD(PharFileInfo, __construct)
44794479
phar_archive_data *phar_data;
44804480
zval *zobj = ZEND_THIS, arg1;
44814481

4482-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "p", &fname, &fname_len) == FAILURE) {
4482+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &fname, &fname_len) == FAILURE) {
44834483
return;
44844484
}
44854485

‎ext/reflection/php_reflection.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ ZEND_METHOD(reflection_function, __construct)
14701470
} else {
14711471
ALLOCA_FLAG(use_heap)
14721472

1473-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "S", &fname) == FAILURE) {
1473+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &fname) == FAILURE) {
14741474
return;
14751475
}
14761476

@@ -2051,7 +2051,7 @@ ZEND_METHOD(reflection_generator, __construct)
20512051
object = ZEND_THIS;
20522052
intern = Z_REFLECTION_P(object);
20532053

2054-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "O", &generator, zend_ce_generator) == FAILURE) {
2054+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &generator, zend_ce_generator) == FAILURE) {
20552055
return;
20562056
}
20572057

@@ -2231,7 +2231,7 @@ ZEND_METHOD(reflection_parameter, __construct)
22312231
zend_class_entry *ce = NULL;
22322232
zend_bool is_closure = 0;
22332233

2234-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "zz", &reference, &parameter) == FAILURE) {
2234+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &reference, &parameter) == FAILURE) {
22352235
return;
22362236
}
22372237

@@ -2907,7 +2907,7 @@ ZEND_METHOD(reflection_method, __construct)
29072907
zval ztmp;
29082908

29092909
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "zs", &classname, &name_str, &name_len) == FAILURE) {
2910-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) {
2910+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) {
29112911
return;
29122912
}
29132913

@@ -3471,7 +3471,7 @@ ZEND_METHOD(reflection_class_constant, __construct)
34713471
zend_class_entry *ce;
34723472
zend_class_constant *constant = NULL;
34733473

3474-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "zS", &classname, &constname) == FAILURE) {
3474+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zS", &classname, &constname) == FAILURE) {
34753475
return;
34763476
}
34773477

@@ -5207,7 +5207,7 @@ ZEND_METHOD(reflection_property, __construct)
52075207
zend_property_info *property_info = NULL;
52085208
property_reference *reference;
52095209

5210-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "zS", &classname, &name) == FAILURE) {
5210+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zS", &classname, &name) == FAILURE) {
52115211
return;
52125212
}
52135213

@@ -5649,7 +5649,7 @@ ZEND_METHOD(reflection_extension, __construct)
56495649
size_t name_len;
56505650
ALLOCA_FLAG(use_heap)
56515651

5652-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) {
5652+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) {
56535653
return;
56545654
}
56555655

@@ -6002,7 +6002,7 @@ ZEND_METHOD(reflection_zend_extension, __construct)
60026002
char *name_str;
60036003
size_t name_len;
60046004

6005-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) {
6005+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name_str, &name_len) == FAILURE) {
60066006
return;
60076007
}
60086008

@@ -6164,7 +6164,7 @@ ZEND_METHOD(reflection_reference, fromArrayElement)
61646164
zval *key, *item;
61656165
reflection_object *intern;
61666166

6167-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "hz", &ht, &key) == FAILURE) {
6167+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "hz", &ht, &key) == FAILURE) {
61686168
return;
61696169
}
61706170

‎ext/simplexml/simplexml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2277,7 +2277,7 @@ SXE_METHOD(__construct)
22772277
zend_long options = 0;
22782278
zend_bool is_url = 0, isprefix = 0;
22792279

2280-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "s|lbsb", &data, &data_len, &options, &is_url, &ns, &ns_len, &isprefix) == FAILURE) {
2280+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|lbsb", &data, &data_len, &options, &is_url, &ns, &ns_len, &isprefix) == FAILURE) {
22812281
return;
22822282
}
22832283

‎ext/snmp/snmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@ PHP_METHOD(snmp, __construct)
15301530

15311531
snmp_object = Z_SNMP_P(object);
15321532

1533-
if (zend_parse_parameters_throw(argc, "lss|ll", &version, &a1, &a1_len, &a2, &a2_len, &timeout, &retries) == FAILURE) {
1533+
if (zend_parse_parameters(argc, "lss|ll", &version, &a1, &a1_len, &a2, &a2_len, &timeout, &retries) == FAILURE) {
15341534
return;
15351535
}
15361536

‎ext/soap/soap.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ PHP_METHOD(SoapParam, __construct)
646646
size_t name_length;
647647
zval *this_ptr;
648648

649-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "zs", &data, &name, &name_length) == FAILURE) {
649+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zs", &data, &name, &name_length) == FAILURE) {
650650
return;
651651
}
652652
if (name_length == 0) {
@@ -671,7 +671,7 @@ PHP_METHOD(SoapHeader, __construct)
671671
zend_bool must_understand = 0;
672672
zval *this_ptr;
673673

674-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "ss|zbz", &ns, &ns_len, &name, &name_len, &data, &must_understand, &actor) == FAILURE) {
674+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|zbz", &ns, &ns_len, &name, &name_len, &data, &must_understand, &actor) == FAILURE) {
675675
return;
676676
}
677677
if (ns_len == 0) {
@@ -712,7 +712,7 @@ PHP_METHOD(SoapFault, __construct)
712712
size_t fault_string_len, fault_actor_len = 0, name_len = 0, fault_code_len = 0;
713713
zval *code = NULL, *details = NULL, *headerfault = NULL, *this_ptr;
714714

715-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "zs|s!z!s!z!",
715+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "zs|s!z!s!z!",
716716
&code,
717717
&fault_string, &fault_string_len,
718718
&fault_actor, &fault_actor_len,
@@ -815,7 +815,7 @@ PHP_METHOD(SoapVar, __construct)
815815
char *stype = NULL, *ns = NULL, *name = NULL, *namens = NULL;
816816
size_t stype_len = 0, ns_len = 0, name_len = 0, namens_len = 0;
817817

818-
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "z!z|ssss", &data, &type, &stype, &stype_len, &ns, &ns_len, &name, &name_len, &namens, &namens_len) == FAILURE) {
818+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "z!z|ssss", &data, &type, &stype, &stype_len, &ns, &ns_len, &name, &name_len, &namens, &namens_len) == FAILURE) {
819819
return;
820820
}
821821

0 commit comments

Comments
 (0)