Skip to content

Convert remaining zend_parse_parameters_none() to fast ZPP #21343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexandre-daubois wants to merge 1 commit into
base: master
Choose a base branch
from
+93 −210
Open

Convert remaining zend_parse_parameters_none() to fast ZPP #21343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ext/pdo/pdo_stmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,9 +1916,7 @@ PHP_METHOD(PDOStatement, debugDumpParams)

PHP_METHOD(PDOStatement, getIterator)
{
if (zend_parse_parameters_none() == FAILURE) {
return;
}
ZEND_PARSE_PARAMETERS_NONE();

zend_create_internal_iterator_zval(return_value, ZEND_THIS);
}
Expand Down
40 changes: 10 additions & 30 deletions ext/simplexml/simplexml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,9 +1614,7 @@ PHP_METHOD(SimpleXMLElement, getName)
xmlNodePtr node;
int namelen;

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

sxe = Z_SXEOBJ_P(ZEND_THIS);

Expand Down Expand Up @@ -1900,9 +1898,7 @@ static zend_result sxe_object_cast(zend_object *readobj, zval *writeobj, int typ
/* {{{ Returns the string content */
PHP_METHOD(SimpleXMLElement, __toString)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

zend_result rv = sxe_object_cast_ex(Z_OBJ_P(ZEND_THIS), return_value, IS_STRING);
ZEND_IGNORE_VALUE(rv);
Expand Down Expand Up @@ -1950,9 +1946,7 @@ PHP_METHOD(SimpleXMLElement, count)
{
php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_LONG(php_sxe_count_elements_helper(sxe));
}
Expand All @@ -1962,9 +1956,7 @@ PHP_METHOD(SimpleXMLElement, count)
/* {{{ Rewind to first element */
PHP_METHOD(SimpleXMLElement, rewind)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

php_sxe_rewind_iterator(Z_SXEOBJ_P(ZEND_THIS));
}
Expand All @@ -1975,9 +1967,7 @@ PHP_METHOD(SimpleXMLElement, valid)
{
php_sxe_object *sxe = Z_SXEOBJ_P(ZEND_THIS);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

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

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

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

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

if (Z_ISUNDEF(sxe->iter.data)) {
zend_throw_error(NULL, "Iterator not initialized or already consumed");
Expand All @@ -2031,9 +2017,7 @@ PHP_METHOD(SimpleXMLElement, key)
/* {{{ Move to next element */
PHP_METHOD(SimpleXMLElement, next)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

php_sxe_move_forward_iterator(Z_SXEOBJ_P(ZEND_THIS));
}
Expand All @@ -2046,9 +2030,7 @@ PHP_METHOD(SimpleXMLElement, hasChildren)
php_sxe_object *child;
xmlNodePtr node;

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

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

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

if (Z_ISUNDEF(sxe->iter.data) || sxe->iter.type == SXE_ITER_ATTRLIST) {
return; /* return NULL */
Expand Down
20 changes: 5 additions & 15 deletions ext/snmp/snmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,9 +1434,7 @@ PHP_FUNCTION(snmpset)
/* {{{ Return the current status of quick_print */
PHP_FUNCTION(snmp_get_quick_print)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_BOOL(netsnmp_ds_get_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT));
}
Expand Down Expand Up @@ -1587,9 +1585,7 @@ PHP_FUNCTION(snmp_set_valueretrieval)
/* {{{ Return the method how the SNMP values will be returned */
PHP_FUNCTION(snmp_get_valueretrieval)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_LONG(SNMP_G(valueretrieval));
}
Expand Down Expand Up @@ -1666,9 +1662,7 @@ PHP_METHOD(SNMP, close)

snmp_object = Z_SNMP_P(object);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

snmp_session_free(&(snmp_object->session));

Expand Down Expand Up @@ -1737,9 +1731,7 @@ PHP_METHOD(SNMP, getErrno)

snmp_object = Z_SNMP_P(object);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_LONG(snmp_object->snmp_errno);
}
Expand All @@ -1753,9 +1745,7 @@ PHP_METHOD(SNMP, getError)

snmp_object = Z_SNMP_P(object);

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_STRING(snmp_object->snmp_errstr);
}
Expand Down
36 changes: 9 additions & 27 deletions ext/soap/soap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +730,7 @@ PHP_METHOD(SoapFault, __toString)
zend_string *faultcode_val, *faultstring_val, *file_val;
zend_long line_val;

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

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

if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

FETCH_THIS_SERVICE_NO_BAILOUT(service);

Expand Down Expand Up @@ -2692,9 +2688,7 @@ PHP_METHOD(SoapClient, __soapCall)
/* {{{ Returns list of SOAP functions */
PHP_METHOD(SoapClient, __getFunctions)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

sdl *sdl;
FETCH_THIS_SDL(sdl);
Expand All @@ -2717,9 +2711,7 @@ PHP_METHOD(SoapClient, __getFunctions)
/* {{{ Returns list of SOAP types */
PHP_METHOD(SoapClient, __getTypes)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

sdl *sdl;
FETCH_THIS_SDL(sdl);
Expand All @@ -2744,9 +2736,7 @@ PHP_METHOD(SoapClient, __getTypes)
/* {{{ Returns last SOAP request */
PHP_METHOD(SoapClient, __getLastRequest)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_COPY(Z_CLIENT_LAST_REQUEST_P(ZEND_THIS));
}
Expand All @@ -2756,9 +2746,7 @@ PHP_METHOD(SoapClient, __getLastRequest)
/* {{{ Returns last SOAP response */
PHP_METHOD(SoapClient, __getLastResponse)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_COPY(Z_CLIENT_LAST_RESPONSE_P(ZEND_THIS));
}
Expand All @@ -2768,9 +2756,7 @@ PHP_METHOD(SoapClient, __getLastResponse)
/* {{{ Returns last SOAP request headers */
PHP_METHOD(SoapClient, __getLastRequestHeaders)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_COPY(Z_CLIENT_LAST_REQUEST_HEADERS_P(ZEND_THIS));
}
Expand All @@ -2780,9 +2766,7 @@ PHP_METHOD(SoapClient, __getLastRequestHeaders)
/* {{{ Returns last SOAP response headers */
PHP_METHOD(SoapClient, __getLastResponseHeaders)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_COPY(Z_CLIENT_LAST_RESPONSE_HEADERS_P(ZEND_THIS));
}
Expand Down Expand Up @@ -2848,9 +2832,7 @@ PHP_METHOD(SoapClient, __setCookie)
/* {{{ Returns list of cookies */
PHP_METHOD(SoapClient, __getCookies)
{
if (zend_parse_parameters_none() == FAILURE) {
RETURN_THROWS();
}
ZEND_PARSE_PARAMETERS_NONE();

RETURN_COPY(Z_CLIENT_COOKIES_P(ZEND_THIS));
}
Expand Down
Loading
Loading