From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 16 Dec 2003 17:14:06 +0000 (+0000)
Subject: Removed duplicate php_libxml_(init|shutdown) they are already done by
X-Git-Tag: php-5.0.0b3RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf36e351ba713057e29b15220125be2eb4e94800;p=php

Removed duplicate php_libxml_(init|shutdown) they are already done by
ext/libxml.
---

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index f2f80ae759..44e56a557e 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -631,8 +631,6 @@ PHP_MINIT_FUNCTION(dom)
 	REGISTER_LONG_CONSTANT("DOM_INVALID_ACCESS_ERR",	INVALID_ACCESS_ERR,		CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("DOM_VALIDATION_ERR",		VALIDATION_ERR,			CONST_CS | CONST_PERSISTENT);
 
-	php_libxml_initialize();
-
 	return SUCCESS;
 }
 /* }}} */
@@ -663,8 +661,6 @@ PHP_MINFO_FUNCTION(dom)
 
 PHP_MSHUTDOWN_FUNCTION(dom)
 {
-	php_libxml_shutdown();
-
 	zend_hash_destroy(&dom_domstringlist_prop_handlers);
 	zend_hash_destroy(&dom_namelist_prop_handlers);
 	zend_hash_destroy(&dom_domimplementationlist_prop_handlers);
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 986f8c3f14..b753edc9c5 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1533,8 +1533,6 @@ PHP_MINIT_FUNCTION(simplexml)
 	sxe_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry;
 	sxe_object_handlers.get_class_name = zend_get_std_object_handlers()->get_class_name;
 
-	php_libxml_initialize();
-
 	return SUCCESS;
 }
 /* }}} */
@@ -1543,8 +1541,6 @@ PHP_MINIT_FUNCTION(simplexml)
  */
 PHP_MSHUTDOWN_FUNCTION(simplexml)
 {
-	php_libxml_shutdown();
-
 	return SUCCESS;
 }
 /* }}} */
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 8b3306dd57..3a17f31b00 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -247,10 +247,7 @@ PHP_MINIT_FUNCTION(xml)
 #else
 	REGISTER_STRING_CONSTANT("XML_SAX_IMPL", "expat", CONST_CS|CONST_PERSISTENT);
 #endif
-	
-#ifdef LIBXML_EXPAT_COMPAT
-	php_libxml_initialize();
-#endif
+
 	return SUCCESS;
 }
 
@@ -263,9 +260,6 @@ PHP_RINIT_FUNCTION(xml)
 
 PHP_MSHUTDOWN_FUNCTION(xml)
 {
-#ifdef LIBXML_EXPAT_COMPAT
-	php_libxml_shutdown();
-#endif
 	return SUCCESS;
 }