@@ -468,12 +468,7 @@ static void php_xmlreader_no_arg_string(INTERNAL_FUNCTION_PARAMETERS, xmlreader_
468468
469469/* {{{ php_xmlreader_set_relaxng_schema */
470470static void php_xmlreader_set_relaxng_schema (INTERNAL_FUNCTION_PARAMETERS , int type ) {
471- #ifdef LIBXML_SCHEMAS_ENABLED
472- zval * id ;
473471 size_t source_len = 0 ;
474- int retval = -1 ;
475- xmlreader_object * intern ;
476- xmlRelaxNGPtr schema = NULL ;
477472 char * source ;
478473
479474 if (zend_parse_parameters (ZEND_NUM_ARGS (), "p!" , & source , & source_len ) == FAILURE ) {
@@ -484,11 +479,13 @@ static void php_xmlreader_set_relaxng_schema(INTERNAL_FUNCTION_PARAMETERS, int t
484479 zend_argument_value_error (1 , "cannot be empty" );
485480 RETURN_THROWS ();
486481 }
487-
488- id = ZEND_THIS ;
489-
490- intern = Z_XMLREADER_P (id );
482+
483+ #ifdef LIBXML_SCHEMAS_ENABLED
484+ xmlreader_object * intern = Z_XMLREADER_P (ZEND_THIS );
491485 if (intern -> ptr ) {
486+ int retval = -1 ;
487+ xmlRelaxNGPtr schema = NULL ;
488+
492489 if (source ) {
493490 schema = _xmlreader_get_relaxNG (source , source_len , type , NULL , NULL );
494491 if (schema ) {
@@ -926,11 +923,7 @@ PHP_METHOD(XMLReader, readString)
926923/* {{{ Use W3C XSD schema to validate the document as it is processed. Activation is only possible before the first Read(). */
927924PHP_METHOD (XMLReader , setSchema )
928925{
929- #ifdef LIBXML_SCHEMAS_ENABLED
930- zval * id ;
931926 size_t source_len = 0 ;
932- int retval = -1 ;
933- xmlreader_object * intern ;
934927 char * source ;
935928
936929 if (zend_parse_parameters (ZEND_NUM_ARGS (), "p!" , & source , & source_len ) == FAILURE ) {
@@ -941,13 +934,12 @@ PHP_METHOD(XMLReader, setSchema)
941934 zend_argument_value_error (1 , "cannot be empty" );
942935 RETURN_THROWS ();
943936 }
944-
945- id = ZEND_THIS ;
946-
947- intern = Z_XMLREADER_P (id );
937+
938+ #ifdef LIBXML_SCHEMAS_ENABLED
939+ xmlreader_object * intern = Z_XMLREADER_P (ZEND_THIS );
948940 if (intern && intern -> ptr ) {
949941 PHP_LIBXML_SANITIZE_GLOBALS (schema );
950- retval = xmlTextReaderSchemaValidate (intern -> ptr , source );
942+ int retval = xmlTextReaderSchemaValidate (intern -> ptr , source );
951943 PHP_LIBXML_RESTORE_GLOBALS (schema );
952944
953945 if (retval == 0 ) {
0 commit comments