archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Eliminate useless $this related checks

Browse source
This commit is contained in:
Dmitry Stogov 2018-11-14 03:46:42 +03:00
parent 54a7d03934
commit 5ebefa74cf
1 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ext/xmlreader/php_xmlreader.c
View file

@ -402,7 +402,7 @@ static void php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlreader_rea
RETURN_FALSE;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -424,7 +424,7 @@ static void php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAMETERS, xmlreader_read_in
int retval;
xmlreader_object *intern;
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -448,7 +448,7 @@ static void php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAMETERS, xmlreader_
char *retchar = NULL;
xmlreader_object *intern;
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -483,7 +483,7 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t
RETURN_FALSE;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -526,7 +526,7 @@ PHP_METHOD(xmlreader, close)
zval *id;
xmlreader_object *intern;
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
/* libxml is segfaulting in versions up to 2.6.8 using xmlTextReaderClose so for
now we will free the whole reader when close is called as it would get rebuilt on
@ -558,7 +558,7 @@ PHP_METHOD(xmlreader, getAttributeNo)
return;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -589,7 +589,7 @@ PHP_METHOD(xmlreader, getAttributeNs)
RETURN_FALSE;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -615,7 +615,7 @@ PHP_METHOD(xmlreader, getParserProperty)
return;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -667,7 +667,7 @@ PHP_METHOD(xmlreader, moveToAttribute)
RETURN_FALSE;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -695,7 +695,7 @@ PHP_METHOD(xmlreader, moveToAttributeNo)
return;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -729,7 +729,7 @@ PHP_METHOD(xmlreader, moveToAttributeNs)
RETURN_FALSE;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -775,7 +775,7 @@ PHP_METHOD(xmlreader, read)
int retval;
xmlreader_object *intern;
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern != NULL && intern->ptr != NULL) {
retval = xmlTextReaderRead(intern->ptr);
@ -805,7 +805,7 @@ PHP_METHOD(xmlreader, next)
return;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern != NULL && intern->ptr != NULL) {
retval = xmlTextReaderNext(intern->ptr);
@ -935,7 +935,7 @@ PHP_METHOD(xmlreader, setSchema)
RETURN_FALSE;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -972,7 +972,7 @@ PHP_METHOD(xmlreader, setParserProperty)
return;
}
id = getThis();
id = &EX(This);
intern = Z_XMLREADER_P(id);
if (intern && intern->ptr) {
@ -1105,7 +1105,8 @@ PHP_METHOD(xmlreader, expand)
xmlDocPtr docp = NULL;
php_libxml_node_object *domobj = NULL;
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|O!", &id, xmlreader_class_entry, &basenode, dom_node_class_entry) == FAILURE) {
id = &EX(This);
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|O!", &basenode, dom_node_class_entry) == FAILURE) {
return;
}