pajoye Tue, 30 Aug 2011 05:44:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315756
Log:
- ws
Changed paths:
U php/php-src/branches/PHP_5_3/ext/libxml/libxml.c
U php/php-src/branches/PHP_5_4/ext/libxml/libxml.c
U php/php-src/trunk/ext/libxml/libxml.c
Modified: php/php-src/branches/PHP_5_3/ext/libxml/libxml.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/libxml/libxml.c 2011-08-30 03:47:53 UTC
(rev 315755)
+++ php/php-src/branches/PHP_5_3/ext/libxml/libxml.c 2011-08-30 05:44:37 UTC
(rev 315756)
@@ -228,9 +228,9 @@
php_libxml_node_free_list((xmlNodePtr)
node->properties TSRMLS_CC);
break;
case XML_ATTRIBUTE_NODE:
- if ((node->doc != NULL) &&
(((xmlAttrPtr) node)->atype == XML_ATTRIBUTE_ID)) {
- xmlRemoveID(node->doc,
(xmlAttrPtr) node);
- }
+ if ((node->doc != NULL) &&
(((xmlAttrPtr) node)->atype == XML_ATTRIBUTE_ID)) {
+ xmlRemoveID(node->doc,
(xmlAttrPtr) node);
+ }
case XML_ATTRIBUTE_DECL:
case XML_DTD_NODE:
case XML_DOCUMENT_TYPE_NODE:
Modified: php/php-src/branches/PHP_5_4/ext/libxml/libxml.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/libxml/libxml.c 2011-08-30 03:47:53 UTC
(rev 315755)
+++ php/php-src/branches/PHP_5_4/ext/libxml/libxml.c 2011-08-30 05:44:37 UTC
(rev 315756)
@@ -236,9 +236,9 @@
php_libxml_node_free_list((xmlNodePtr)
node->properties TSRMLS_CC);
break;
case XML_ATTRIBUTE_NODE:
- if ((node->doc != NULL) &&
(((xmlAttrPtr) node)->atype == XML_ATTRIBUTE_ID)) {
- xmlRemoveID(node->doc,
(xmlAttrPtr) node);
- }
+ if ((node->doc != NULL) &&
(((xmlAttrPtr) node)->atype == XML_ATTRIBUTE_ID)) {
+ xmlRemoveID(node->doc,
(xmlAttrPtr) node);
+ }
case XML_ATTRIBUTE_DECL:
case XML_DTD_NODE:
case XML_DOCUMENT_TYPE_NODE:
@@ -552,8 +552,8 @@
static xmlParserInputPtr _php_libxml_external_entity_loader(const char *URL,
const char *ID, xmlParserCtxtPtr context)
{
- xmlParserInputPtr ret = NULL;
- const char *resource = NULL;
+ xmlParserInputPtr ret = NULL;
+ const char *resource = NULL;
zval *public = NULL,
*system = NULL,
*ctxzv = NULL,
@@ -647,7 +647,7 @@
} else if (Z_TYPE_P(retval_ptr) != IS_NULL) {
/* retval not string nor resource nor null; convert to
string */
SEPARATE_ZVAL(&retval_ptr);
- convert_to_string(retval_ptr);
+ convert_to_string(retval_ptr);
goto is_string;
} /* else is null; don't try anything */
}
@@ -671,7 +671,7 @@
if (retval_ptr != NULL) {
zval_ptr_dtor(&retval_ptr);
}
- return ret;
+ return ret;
}
PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...)
Modified: php/php-src/trunk/ext/libxml/libxml.c
===================================================================
--- php/php-src/trunk/ext/libxml/libxml.c 2011-08-30 03:47:53 UTC (rev
315755)
+++ php/php-src/trunk/ext/libxml/libxml.c 2011-08-30 05:44:37 UTC (rev
315756)
@@ -236,9 +236,9 @@
php_libxml_node_free_list((xmlNodePtr)
node->properties TSRMLS_CC);
break;
case XML_ATTRIBUTE_NODE:
- if ((node->doc != NULL) &&
(((xmlAttrPtr) node)->atype == XML_ATTRIBUTE_ID)) {
- xmlRemoveID(node->doc,
(xmlAttrPtr) node);
- }
+ if ((node->doc != NULL) &&
(((xmlAttrPtr) node)->atype == XML_ATTRIBUTE_ID)) {
+ xmlRemoveID(node->doc,
(xmlAttrPtr) node);
+ }
case XML_ATTRIBUTE_DECL:
case XML_DTD_NODE:
case XML_DOCUMENT_TYPE_NODE:
@@ -552,8 +552,8 @@
static xmlParserInputPtr _php_libxml_external_entity_loader(const char *URL,
const char *ID, xmlParserCtxtPtr context)
{
- xmlParserInputPtr ret = NULL;
- const char *resource = NULL;
+ xmlParserInputPtr ret = NULL;
+ const char *resource = NULL;
zval *public = NULL,
*system = NULL,
*ctxzv = NULL,
@@ -647,7 +647,7 @@
} else if (Z_TYPE_P(retval_ptr) != IS_NULL) {
/* retval not string nor resource nor null; convert to
string */
SEPARATE_ZVAL(&retval_ptr);
- convert_to_string(retval_ptr);
+ convert_to_string(retval_ptr);
goto is_string;
} /* else is null; don't try anything */
}
@@ -671,7 +671,7 @@
if (retval_ptr != NULL) {
zval_ptr_dtor(&retval_ptr);
}
- return ret;
+ return ret;
}
PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
