Skip to content

Commit 7afa9e4

Browse files
alexandre-dauboisalexandre-daubois
committed
Convert remaining zend_parse_parameters_none() to ZPP
1 parent 11a9574 commit 7afa9e4

File tree

8 files changed

+93
-210
lines changed

8 files changed

+93
-210
lines changed

‎ext/pdo/pdo_stmt.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1916,9 +1916,7 @@ PHP_METHOD(PDOStatement, debugDumpParams)
19161916

19171917
PHP_METHOD(PDOStatement, getIterator)
19181918
{
1919-
if (zend_parse_parameters_none() == FAILURE) {
1920-
return;
1921-
}
1919+
ZEND_PARSE_PARAMETERS_NONE();
19221920

19231921
zend_create_internal_iterator_zval(return_value, ZEND_THIS);
19241922
}

‎ext/simplexml/simplexml.c‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,9 +1614,7 @@ PHP_METHOD(SimpleXMLElement, getName)
16141614
xmlNodePtr node;
16151615
int namelen;
16161616

1617-
if (zend_parse_parameters_none() == FAILURE) {
1618-
RETURN_THROWS();
1619-
}
1617+
ZEND_PARSE_PARAMETERS_NONE();
16201618

16211619
sxe = Z_SXEOBJ_P(ZEND_THIS);
16221620

@@ -1900,9 +1898,7 @@ static zend_result sxe_object_cast(zend_object *readobj, zval *writeobj, int typ
19001898
/* {{{ Returns the string content */
19011899
PHP_METHOD(SimpleXMLElement, __toString)
19021900
{
1903-
if (zend_parse_parameters_none() == FAILURE) {
1904-
RETURN_THROWS();
1905-
}
1901+
ZEND_PARSE_PARAMETERS_NONE();
19061902

19071903
zend_result rv = sxe_object_cast_ex(Z_OBJ_P(ZEND_THIS), return_value, IS_STRING);
19081904
ZEND_IGNORE_VALUE(rv);
@@ -1950,9 +1946,7 @@ PHP_METHOD(SimpleXMLElement, count)
19501946
{
19511947
php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS);
19521948

1953-
if (zend_parse_parameters_none() == FAILURE) {
1954-
RETURN_THROWS();
1955-
}
1949+
ZEND_PARSE_PARAMETERS_NONE();
19561950

19571951
RETURN_LONG(php_sxe_count_elements_helper(sxe));
19581952
}
@@ -1962,9 +1956,7 @@ PHP_METHOD(SimpleXMLElement, count)
19621956
/* {{{ Rewind to first element */
19631957
PHP_METHOD(SimpleXMLElement, rewind)
19641958
{
1965-
if (zend_parse_parameters_none() == FAILURE) {
1966-
RETURN_THROWS();
1967-
}
1959+
ZEND_PARSE_PARAMETERS_NONE();
19681960

19691961
php_sxe_rewind_iterator(Z_SXEOBJ_P(ZEND_THIS));
19701962
}
@@ -1975,9 +1967,7 @@ PHP_METHOD(SimpleXMLElement, valid)
19751967
{
19761968
php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS);
19771969

1978-
if (zend_parse_parameters_none() == FAILURE) {
1979-
RETURN_THROWS();
1980-
}
1970+
ZEND_PARSE_PARAMETERS_NONE();
19811971

19821972
RETURN_BOOL(!Z_ISUNDEF(sxe->iter.data));
19831973
}
@@ -1988,9 +1978,7 @@ PHP_METHOD(SimpleXMLElement, current)
19881978
{
19891979
php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS);
19901980

1991-
if (zend_parse_parameters_none() == FAILURE) {
1992-
RETURN_THROWS();
1993-
}
1981+
ZEND_PARSE_PARAMETERS_NONE();
19941982

19951983
if (Z_ISUNDEF(sxe->iter.data)) {
19961984
zend_throw_error(NULL, "Iterator not initialized or already consumed");
@@ -2008,9 +1996,7 @@ PHP_METHOD(SimpleXMLElement, key)
20081996
php_sxe_object *intern;
20091997
php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS);
20101998

2011-
if (zend_parse_parameters_none() == FAILURE) {
2012-
RETURN_THROWS();
2013-
}
1999+
ZEND_PARSE_PARAMETERS_NONE();
20142000

20152001
if (Z_ISUNDEF(sxe->iter.data)) {
20162002
zend_throw_error(NULL, "Iterator not initialized or already consumed");
@@ -2031,9 +2017,7 @@ PHP_METHOD(SimpleXMLElement, key)
20312017
/* {{{ Move to next element */
20322018
PHP_METHOD(SimpleXMLElement, next)
20332019
{
2034-
if (zend_parse_parameters_none() == FAILURE) {
2035-
RETURN_THROWS();
2036-
}
2020+
ZEND_PARSE_PARAMETERS_NONE();
20372021

20382022
php_sxe_move_forward_iterator(Z_SXEOBJ_P(ZEND_THIS));
20392023
}
@@ -2046,9 +2030,7 @@ PHP_METHOD(SimpleXMLElement, hasChildren)
20462030
php_sxe_object *child;
20472031
xmlNodePtr node;
20482032

2049-
if (zend_parse_parameters_none() == FAILURE) {
2050-
RETURN_THROWS();
2051-
}
2033+
ZEND_PARSE_PARAMETERS_NONE();
20522034

20532035
if (Z_ISUNDEF(sxe->iter.data) || sxe->iter.type == SXE_ITER_ATTRLIST) {
20542036
RETURN_FALSE;
@@ -2071,9 +2053,7 @@ PHP_METHOD(SimpleXMLElement, getChildren)
20712053
{
20722054
php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS);
20732055

2074-
if (zend_parse_parameters_none() == FAILURE) {
2075-
RETURN_THROWS();
2076-
}
2056+
ZEND_PARSE_PARAMETERS_NONE();
20772057

20782058
if (Z_ISUNDEF(sxe->iter.data) || sxe->iter.type == SXE_ITER_ATTRLIST) {
20792059
return; /* return NULL */

‎ext/snmp/snmp.c‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,9 +1434,7 @@ PHP_FUNCTION(snmpset)
14341434
/* {{{ Return the current status of quick_print */
14351435
PHP_FUNCTION(snmp_get_quick_print)
14361436
{
1437-
if (zend_parse_parameters_none() == FAILURE) {
1438-
RETURN_THROWS();
1439-
}
1437+
ZEND_PARSE_PARAMETERS_NONE();
14401438

14411439
RETURN_BOOL(netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT));
14421440
}
@@ -1587,9 +1585,7 @@ PHP_FUNCTION(snmp_set_valueretrieval)
15871585
/* {{{ Return the method how the SNMP values will be returned */
15881586
PHP_FUNCTION(snmp_get_valueretrieval)
15891587
{
1590-
if (zend_parse_parameters_none() == FAILURE) {
1591-
RETURN_THROWS();
1592-
}
1588+
ZEND_PARSE_PARAMETERS_NONE();
15931589

15941590
RETURN_LONG(SNMP_G(valueretrieval));
15951591
}
@@ -1666,9 +1662,7 @@ PHP_METHOD(SNMP, close)
16661662

16671663
snmp_object = Z_SNMP_P(object);
16681664

1669-
if (zend_parse_parameters_none() == FAILURE) {
1670-
RETURN_THROWS();
1671-
}
1665+
ZEND_PARSE_PARAMETERS_NONE();
16721666

16731667
snmp_session_free(&(snmp_object->session));
16741668

@@ -1737,9 +1731,7 @@ PHP_METHOD(SNMP, getErrno)
17371731

17381732
snmp_object = Z_SNMP_P(object);
17391733

1740-
if (zend_parse_parameters_none() == FAILURE) {
1741-
RETURN_THROWS();
1742-
}
1734+
ZEND_PARSE_PARAMETERS_NONE();
17431735

17441736
RETURN_LONG(snmp_object->snmp_errno);
17451737
}
@@ -1753,9 +1745,7 @@ PHP_METHOD(SNMP, getError)
17531745

17541746
snmp_object = Z_SNMP_P(object);
17551747

1756-
if (zend_parse_parameters_none() == FAILURE) {
1757-
RETURN_THROWS();
1758-
}
1748+
ZEND_PARSE_PARAMETERS_NONE();
17591749

17601750
RETURN_STRING(snmp_object->snmp_errstr);
17611751
}

‎ext/soap/soap.c‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -730,9 +730,7 @@ PHP_METHOD(SoapFault, __toString)
730730
zend_string *faultcode_val, *faultstring_val, *file_val;
731731
zend_long line_val;
732732

733-
if (zend_parse_parameters_none() == FAILURE) {
734-
RETURN_THROWS();
735-
}
733+
ZEND_PARSE_PARAMETERS_NONE();
736734

737735
this_ptr = ZEND_THIS;
738736
faultcode = zend_read_property(soap_fault_class_entry, Z_OBJ_P(this_ptr), "faultcode", sizeof("faultcode")-1, 1, &rv1);
@@ -1134,9 +1132,7 @@ PHP_METHOD(SoapServer, getFunctions)
11341132
soapServicePtr service;
11351133
HashTable *ft = NULL;
11361134

1137-
if (zend_parse_parameters_none() == FAILURE) {
1138-
RETURN_THROWS();
1139-
}
1135+
ZEND_PARSE_PARAMETERS_NONE();
11401136

11411137
FETCH_THIS_SERVICE_NO_BAILOUT(service);
11421138

@@ -2692,9 +2688,7 @@ PHP_METHOD(SoapClient, __soapCall)
26922688
/* {{{ Returns list of SOAP functions */
26932689
PHP_METHOD(SoapClient, __getFunctions)
26942690
{
2695-
if (zend_parse_parameters_none() == FAILURE) {
2696-
RETURN_THROWS();
2697-
}
2691+
ZEND_PARSE_PARAMETERS_NONE();
26982692

26992693
sdl *sdl;
27002694
FETCH_THIS_SDL(sdl);
@@ -2717,9 +2711,7 @@ PHP_METHOD(SoapClient, __getFunctions)
27172711
/* {{{ Returns list of SOAP types */
27182712
PHP_METHOD(SoapClient, __getTypes)
27192713
{
2720-
if (zend_parse_parameters_none() == FAILURE) {
2721-
RETURN_THROWS();
2722-
}
2714+
ZEND_PARSE_PARAMETERS_NONE();
27232715

27242716
sdl *sdl;
27252717
FETCH_THIS_SDL(sdl);
@@ -2744,9 +2736,7 @@ PHP_METHOD(SoapClient, __getTypes)
27442736
/* {{{ Returns last SOAP request */
27452737
PHP_METHOD(SoapClient, __getLastRequest)
27462738
{
2747-
if (zend_parse_parameters_none() == FAILURE) {
2748-
RETURN_THROWS();
2749-
}
2739+
ZEND_PARSE_PARAMETERS_NONE();
27502740

27512741
RETURN_COPY(Z_CLIENT_LAST_REQUEST_P(ZEND_THIS));
27522742
}
@@ -2756,9 +2746,7 @@ PHP_METHOD(SoapClient, __getLastRequest)
27562746
/* {{{ Returns last SOAP response */
27572747
PHP_METHOD(SoapClient, __getLastResponse)
27582748
{
2759-
if (zend_parse_parameters_none() == FAILURE) {
2760-
RETURN_THROWS();
2761-
}
2749+
ZEND_PARSE_PARAMETERS_NONE();
27622750

27632751
RETURN_COPY(Z_CLIENT_LAST_RESPONSE_P(ZEND_THIS));
27642752
}
@@ -2768,9 +2756,7 @@ PHP_METHOD(SoapClient, __getLastResponse)
27682756
/* {{{ Returns last SOAP request headers */
27692757
PHP_METHOD(SoapClient, __getLastRequestHeaders)
27702758
{
2771-
if (zend_parse_parameters_none() == FAILURE) {
2772-
RETURN_THROWS();
2773-
}
2759+
ZEND_PARSE_PARAMETERS_NONE();
27742760

27752761
RETURN_COPY(Z_CLIENT_LAST_REQUEST_HEADERS_P(ZEND_THIS));
27762762
}
@@ -2780,9 +2766,7 @@ PHP_METHOD(SoapClient, __getLastRequestHeaders)
27802766
/* {{{ Returns last SOAP response headers */
27812767
PHP_METHOD(SoapClient, __getLastResponseHeaders)
27822768
{
2783-
if (zend_parse_parameters_none() == FAILURE) {
2784-
RETURN_THROWS();
2785-
}
2769+
ZEND_PARSE_PARAMETERS_NONE();
27862770

27872771
RETURN_COPY(Z_CLIENT_LAST_RESPONSE_HEADERS_P(ZEND_THIS));
27882772
}
@@ -2848,9 +2832,7 @@ PHP_METHOD(SoapClient, __setCookie)
28482832
/* {{{ Returns list of cookies */
28492833
PHP_METHOD(SoapClient, __getCookies)
28502834
{
2851-
if (zend_parse_parameters_none() == FAILURE) {
2852-
RETURN_THROWS();
2853-
}
2835+
ZEND_PARSE_PARAMETERS_NONE();
28542836

28552837
RETURN_COPY(Z_CLIENT_COOKIES_P(ZEND_THIS));
28562838
}

0 commit comments

Comments
 (0)