From c081ce628f0d76d44784d7bb8e06428b06142ac0 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:08:10 +0800 Subject: Bump year --- ext/xml/php_xml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/php_xml.h') diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 7766834ea4..0fc25739c4 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 5984f95d8f8d75007fff4963d67ebe65e572efea Mon Sep 17 00:00:00 2001 From: Xinchen Hui 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 From a7482fd2bf340e03b5c5c5ac4f94aacdabccb1ce Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 14 Sep 2014 21:38:46 +0200 Subject: make xml_utf8_ encode/decode work with size_t --- ext/xml/php_xml.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/xml/php_xml.h') diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 0195bb5836..35e61b506a 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -134,8 +134,8 @@ PHP_FUNCTION(utf8_decode); PHP_FUNCTION(xml_parse_into_struct); 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 *); +PHPAPI zend_string *xml_utf8_decode(const XML_Char *, size_t, const XML_Char *); +PHPAPI zend_string *xml_utf8_encode(const char *, size_t, const XML_Char *); #endif /* HAVE_LIBEXPAT */ -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/xml/php_xml.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/xml/php_xml.h') diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h index 35e61b506a..cdb08f812e 100644 --- a/ext/xml/php_xml.h +++ b/ext/xml/php_xml.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1