Skip to content

Commit c1666f8

Browse files
committed
ext/xmlreader: Use new php_streams fast ZPP specifier
1 parent 730d3bf commit c1666f8

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

ext/xmlreader/php_xmlreader.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -998,23 +998,20 @@ static int xml_reader_stream_close(void *context)
998998

999999
PHP_METHOD(XMLReader, fromStream)
10001000
{
1001-
zval *stream_zv;
10021001
php_stream *stream;
10031002
char *document_uri = NULL;
10041003
char *encoding_name = NULL;
10051004
size_t document_uri_len, encoding_name_len;
10061005
zend_long flags = 0;
10071006

10081007
ZEND_PARSE_PARAMETERS_START(1, 4)
1009-
Z_PARAM_RESOURCE(stream_zv);
1008+
PHP_Z_PARAM_STREAM(stream)
10101009
Z_PARAM_OPTIONAL
10111010
Z_PARAM_PATH_OR_NULL(encoding_name, encoding_name_len)
10121011
Z_PARAM_LONG(flags)
10131012
Z_PARAM_PATH_OR_NULL(document_uri, document_uri_len)
10141013
ZEND_PARSE_PARAMETERS_END();
10151014

1016-
php_stream_from_res(stream, Z_RES_P(stream_zv));
1017-
10181015
if (!xmlreader_valid_encoding(encoding_name)) {
10191016
zend_argument_value_error(2, "must be a valid character encoding");
10201017
RETURN_THROWS();
@@ -1036,9 +1033,6 @@ PHP_METHOD(XMLReader, fromStream)
10361033
RETURN_THROWS();
10371034
}
10381035

1039-
/* When the reader is closed (even in error paths) the reference is destroyed. */
1040-
Z_ADDREF_P(stream_zv);
1041-
10421036
if (object_init_with_constructor(return_value, Z_CE_P(ZEND_THIS), 0, NULL, NULL) == SUCCESS) {
10431037
xmlreader_object *intern = Z_XMLREADER_P(return_value);
10441038
intern->ptr = reader;

0 commit comments

Comments
 (0)