- ARG_COUNT(ht) -> ZEND_NUM_ARGS() mega patch

1 files changed, 21 insertions, 21 deletions

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 84b999cb08..d1625d8626 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -986,7 +986,7 @@ PHP_FUNCTION(xml_parser_create)
 	char thisfunc[] = "xml_parser_create";
 	XMLLS_FETCH();
 	
-	argc = ARG_COUNT(ht);
+	argc = ZEND_NUM_ARGS();
 
 	if (argc > 1 || zend_get_parameters_ex(argc, &encodingArg) == FAILURE) {
 		WRONG_PARAM_COUNT;
@@ -1034,7 +1034,7 @@ PHP_FUNCTION(xml_set_object)
 	xml_parser *parser;
 	zval **pind, **mythis;
 
-	if (ARG_COUNT(ht) != 2 ||
+	if (ZEND_NUM_ARGS() != 2 ||
 		zend_get_parameters_ex(2, &pind, &mythis) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
@@ -1073,7 +1073,7 @@ PHP_FUNCTION(xml_set_element_handler)
 	xml_parser *parser;
 	zval **pind, **shdl, **ehdl;
 
-	if (ARG_COUNT(ht) != 3 ||
+	if (ZEND_NUM_ARGS() != 3 ||
 		zend_get_parameters_ex(3, &pind, &shdl, &ehdl) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
@@ -1094,7 +1094,7 @@ PHP_FUNCTION(xml_set_character_data_handler)
 	xml_parser *parser;
 	zval **pind, **hdl;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1113,7 +1113,7 @@ PHP_FUNCTION(xml_set_processing_instruction_handler)
 	xml_parser *parser;
 	zval **pind, **hdl;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1132,7 +1132,7 @@ PHP_FUNCTION(xml_set_default_handler)
 	xml_parser *parser;
 	zval **pind, **hdl;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1150,7 +1150,7 @@ PHP_FUNCTION(xml_set_unparsed_entity_decl_handler)
 	xml_parser *parser;
 	zval **pind, **hdl;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1169,7 +1169,7 @@ PHP_FUNCTION(xml_set_notation_decl_handler)
 	xml_parser *parser;
 	zval **pind, **hdl;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1187,7 +1187,7 @@ PHP_FUNCTION(xml_set_external_entity_ref_handler)
 	xml_parser *parser;
 	zval **pind, **hdl;
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &hdl) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1206,7 +1206,7 @@ PHP_FUNCTION(xml_parse)
 	zval **pind, **data, **final;
 	int argc, isFinal, ret;
 
-	argc = ARG_COUNT(ht);
+	argc = ZEND_NUM_ARGS();
 	if (argc < 2 || argc > 3 || zend_get_parameters_ex(argc, &pind, &data, &final) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
@@ -1235,7 +1235,7 @@ PHP_FUNCTION(xml_parse_into_struct)
 	zval **pind, **data, **xdata, **info = 0;
 	int argc, ret;
 
-	argc = ARG_COUNT(ht);
+	argc = ZEND_NUM_ARGS();
 	if (zend_get_parameters_ex(4, &pind, &data, &xdata,&info) == SUCCESS) {
 		if (!ParameterPassedByReference(ht, 4)) {
 			php_error(E_WARNING, "Array to be filled with values must be passed by reference.");
@@ -1281,7 +1281,7 @@ PHP_FUNCTION(xml_get_error_code)
 	xml_parser *parser;
 	zval **pind;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1297,7 +1297,7 @@ PHP_FUNCTION(xml_error_string)
 	zval **code;
 	char *str;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &code) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &code) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_long_ex(code);
@@ -1315,7 +1315,7 @@ PHP_FUNCTION(xml_get_current_line_number)
 	xml_parser *parser;
 	zval **pind;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1331,7 +1331,7 @@ PHP_FUNCTION(xml_get_current_column_number)
 	xml_parser *parser;
 	zval **pind;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1347,7 +1347,7 @@ PHP_FUNCTION(xml_get_current_byte_index)
 	xml_parser *parser;
 	zval **pind;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1363,7 +1363,7 @@ PHP_FUNCTION(xml_parser_free)
 	zval **pind;
 	xml_parser *parser;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &pind) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 
@@ -1385,7 +1385,7 @@ PHP_FUNCTION(xml_parser_set_option)
 	zval **pind, **opt, **val;
 	char thisfunc[] = "xml_parser_set_option";
 
-	if (ARG_COUNT(ht) != 3 || zend_get_parameters_ex(3, &pind, &opt, &val) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &pind, &opt, &val) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1434,7 +1434,7 @@ PHP_FUNCTION(xml_parser_get_option)
 	zval **pind, **opt;
 	char thisfunc[] = "xml_parser_get_option";
 
-	if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2, &pind, &opt) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &pind, &opt) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	ZEND_FETCH_RESOURCE(parser,xml_parser *, pind, -1, "XML Parser", le_xml_parser);
@@ -1465,7 +1465,7 @@ PHP_FUNCTION(utf8_encode)
 	XML_Char *encoded;
 	int len;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);
@@ -1485,7 +1485,7 @@ PHP_FUNCTION(utf8_decode)
 	XML_Char *decoded;
 	int len;
 
-	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
+	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}
 	convert_to_string_ex(arg);