From 5984f95d8f8d75007fff4963d67ebe65e572efea Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 3 May 2014 15:58:09 +0800
Subject: Refactor XML (incompleted)

---
 ext/xml/php_xml.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'ext/xml/php_xml.h')

diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index 0fc25739c4..0195bb5836 100644
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -44,22 +44,22 @@ ZEND_BEGIN_MODULE_GLOBALS(xml)
 ZEND_END_MODULE_GLOBALS(xml)
 
 typedef struct {
-	int index;
 	int case_folding;
 	XML_Parser parser;
 	XML_Char *target_encoding;
 
-	zval *startElementHandler;
-	zval *endElementHandler;
-	zval *characterDataHandler;
-	zval *processingInstructionHandler;
-	zval *defaultHandler;
-	zval *unparsedEntityDeclHandler;
-	zval *notationDeclHandler;
-	zval *externalEntityRefHandler;
-	zval *unknownEncodingHandler;	
-	zval *startNamespaceDeclHandler;
-	zval *endNamespaceDeclHandler;
+	zval index;
+	zval startElementHandler;
+	zval endElementHandler;
+	zval characterDataHandler;
+	zval processingInstructionHandler;
+	zval defaultHandler;
+	zval unparsedEntityDeclHandler;
+	zval notationDeclHandler;
+	zval externalEntityRefHandler;
+	zval unknownEncodingHandler;	
+	zval startNamespaceDeclHandler;
+	zval endNamespaceDeclHandler;
 
 	zend_function *startElementPtr;
 	zend_function *endElementPtr;
@@ -73,14 +73,14 @@ typedef struct {
 	zend_function *startNamespaceDeclPtr;
 	zend_function *endNamespaceDeclPtr;
 
-	zval *object;
+	zval object;
 
-	zval *data;
-	zval *info;
+	zval data;
+	zval info;
 	int level;
 	int toffset;
 	int curtag;
-	zval **ctag;
+	zval *ctag;
 	char **ltags;
 	int lastwasopen;
 	int skipwhite;
@@ -133,9 +133,9 @@ PHP_FUNCTION(utf8_encode);
 PHP_FUNCTION(utf8_decode);
 PHP_FUNCTION(xml_parse_into_struct);
 
-PHPAPI char *_xml_zval_strdup(zval *val);
-PHPAPI char *xml_utf8_decode(const XML_Char *, int, int *, const XML_Char *);
-PHPAPI char *xml_utf8_encode(const char *s, int len, int *newlen, const XML_Char *encoding);
+PHPAPI char *_xml_zval_strdup(zval *);
+PHPAPI zend_string *xml_utf8_decode(const XML_Char *, int, const XML_Char *);
+PHPAPI zend_string *xml_utf8_encode(const char *, int, const XML_Char *);
 
 #endif /* HAVE_LIBEXPAT */
 
-- 
cgit v1.2.1