Skip to content

Commit 5ebefa7

Browse files
dstogovdstogov
committed
Eliminate useless $this related checks
1 parent 54a7d03 commit 5ebefa7

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

‎ext/xmlreader/php_xmlreader.c‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ static void php_xmlreader_string_arg(INTERNAL_FUNCTION_PARAMETERS, xmlreader_rea
402402
RETURN_FALSE;
403403
}
404404

405-
id = getThis();
405+
id = &EX(This);
406406

407407
intern = Z_XMLREADER_P(id);
408408
if (intern && intern->ptr) {
@@ -424,7 +424,7 @@ static void php_xmlreader_no_arg(INTERNAL_FUNCTION_PARAMETERS, xmlreader_read_in
424424
int retval;
425425
xmlreader_object *intern;
426426

427-
id = getThis();
427+
id = &EX(This);
428428

429429
intern = Z_XMLREADER_P(id);
430430
if (intern && intern->ptr) {
@@ -448,7 +448,7 @@ static void php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAMETERS, xmlreader_
448448
char *retchar = NULL;
449449
xmlreader_object *intern;
450450

451-
id = getThis();
451+
id = &EX(This);
452452

453453
intern = Z_XMLREADER_P(id);
454454
if (intern && intern->ptr) {
@@ -483,7 +483,7 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t
483483
RETURN_FALSE;
484484
}
485485

486-
id = getThis();
486+
id = &EX(This);
487487

488488
intern = Z_XMLREADER_P(id);
489489
if (intern && intern->ptr) {
@@ -526,7 +526,7 @@ PHP_METHOD(xmlreader, close)
526526
zval *id;
527527
xmlreader_object *intern;
528528

529-
id = getThis();
529+
id = &EX(This);
530530
intern = Z_XMLREADER_P(id);
531531
/* libxml is segfaulting in versions up to 2.6.8 using xmlTextReaderClose so for
532532
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)
558558
return;
559559
}
560560

561-
id = getThis();
561+
id = &EX(This);
562562

563563
intern = Z_XMLREADER_P(id);
564564
if (intern && intern->ptr) {
@@ -589,7 +589,7 @@ PHP_METHOD(xmlreader, getAttributeNs)
589589
RETURN_FALSE;
590590
}
591591

592-
id = getThis();
592+
id = &EX(This);
593593

594594
intern = Z_XMLREADER_P(id);
595595
if (intern && intern->ptr) {
@@ -615,7 +615,7 @@ PHP_METHOD(xmlreader, getParserProperty)
615615
return;
616616
}
617617

618-
id = getThis();
618+
id = &EX(This);
619619

620620
intern = Z_XMLREADER_P(id);
621621
if (intern && intern->ptr) {
@@ -667,7 +667,7 @@ PHP_METHOD(xmlreader, moveToAttribute)
667667
RETURN_FALSE;
668668
}
669669

670-
id = getThis();
670+
id = &EX(This);
671671

672672
intern = Z_XMLREADER_P(id);
673673
if (intern && intern->ptr) {
@@ -695,7 +695,7 @@ PHP_METHOD(xmlreader, moveToAttributeNo)
695695
return;
696696
}
697697

698-
id = getThis();
698+
id = &EX(This);
699699

700700
intern = Z_XMLREADER_P(id);
701701
if (intern && intern->ptr) {
@@ -729,7 +729,7 @@ PHP_METHOD(xmlreader, moveToAttributeNs)
729729
RETURN_FALSE;
730730
}
731731

732-
id = getThis();
732+
id = &EX(This);
733733

734734
intern = Z_XMLREADER_P(id);
735735
if (intern && intern->ptr) {
@@ -775,7 +775,7 @@ PHP_METHOD(xmlreader, read)
775775
int retval;
776776
xmlreader_object *intern;
777777

778-
id = getThis();
778+
id = &EX(This);
779779
intern = Z_XMLREADER_P(id);
780780
if (intern != NULL && intern->ptr != NULL) {
781781
retval = xmlTextReaderRead(intern->ptr);
@@ -805,7 +805,7 @@ PHP_METHOD(xmlreader, next)
805805
return;
806806
}
807807

808-
id = getThis();
808+
id = &EX(This);
809809
intern = Z_XMLREADER_P(id);
810810
if (intern != NULL && intern->ptr != NULL) {
811811
retval = xmlTextReaderNext(intern->ptr);
@@ -935,7 +935,7 @@ PHP_METHOD(xmlreader, setSchema)
935935
RETURN_FALSE;
936936
}
937937

938-
id = getThis();
938+
id = &EX(This);
939939

940940
intern = Z_XMLREADER_P(id);
941941
if (intern && intern->ptr) {
@@ -972,7 +972,7 @@ PHP_METHOD(xmlreader, setParserProperty)
972972
return;
973973
}
974974

975-
id = getThis();
975+
id = &EX(This);
976976

977977
intern = Z_XMLREADER_P(id);
978978
if (intern && intern->ptr) {
@@ -1105,7 +1105,8 @@ PHP_METHOD(xmlreader, expand)
11051105
xmlDocPtr docp = NULL;
11061106
php_libxml_node_object *domobj = NULL;
11071107

1108-
if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|O!", &id, xmlreader_class_entry, &basenode, dom_node_class_entry) == FAILURE) {
1108+
id = &EX(This);
1109+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|O!", &basenode, dom_node_class_entry) == FAILURE) {
11091110
return;
11101111
}
11111112

0 commit comments

Comments
 (0)