sterling Fri Jan 9 01:12:32 2004 EDT
Modified files:
/php-src/ext/simplexml php_simplexml.h simplexml.c
Log:
Remove these initializers as they are unused.
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.11
php-src/ext/simplexml/php_simplexml.h:1.12
--- php-src/ext/simplexml/php_simplexml.h:1.11 Thu Jan 8 12:32:46 2004
+++ php-src/ext/simplexml/php_simplexml.h Fri Jan 9 01:12:29 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_simplexml.h,v 1.11 2004/01/08 17:32:46 sniper Exp $ */
+/* $Id: php_simplexml.h,v 1.12 2004/01/09 06:12:29 sterling Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -47,9 +47,9 @@
#include <libxml/xmlschemas.h>
PHP_MINIT_FUNCTION(simplexml);
-PHP_MSHUTDOWN_FUNCTION(simplexml);
+#if HAVE_SPL && !defined(COMPILE_DL_SPL)
PHP_RINIT_FUNCTION(simplexml);
-PHP_RSHUTDOWN_FUNCTION(simplexml);
+#endif
PHP_MINFO_FUNCTION(simplexml);
typedef struct {
@@ -82,7 +82,6 @@
#endif
-
/*
* Local variables:
* tab-width: 4
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.101 php-src/ext/simplexml/simplexml.c:1.102
--- php-src/ext/simplexml/simplexml.c:1.101 Thu Jan 8 17:40:08 2004
+++ php-src/ext/simplexml/simplexml.c Fri Jan 9 01:12:29 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.101 2004/01/08 22:40:08 sterling Exp $ */
+/* $Id: simplexml.c,v 1.102 2004/01/09 06:12:29 sterling Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1578,9 +1578,13 @@
"simplexml",
simplexml_functions,
PHP_MINIT(simplexml),
- PHP_MSHUTDOWN(simplexml),
- PHP_RINIT(simplexml),
- PHP_RSHUTDOWN(simplexml),
+ NULL,
+#if HAVE_SPL && !defined(COMPILE_DL_SPL)
+ PHP_RINIT(simplexml),
+#else
+ NULL,
+#endif
+ NULL,
PHP_MINFO(simplexml),
"0.1",
STANDARD_MODULE_PROPERTIES
@@ -1631,32 +1635,16 @@
}
/* }}} */
-/* {{{ PHP_MSHUTDOWN_FUNCTION(simplexml)
- */
-PHP_MSHUTDOWN_FUNCTION(simplexml)
-{
- return SUCCESS;
-}
-/* }}} */
-
+#if HAVE_SPL && !defined(COMPILE_DL_SPL)
/* {{{ PHP_RINIT_FUNCTION(simplexml)
*/
PHP_RINIT_FUNCTION(simplexml)
{
-#if HAVE_SPL && !defined(COMPILE_DL_SPL)
zend_class_implements(sxe_class_entry TSRMLS_CC, 1, spl_ce_RecursiveIterator);
-#endif
- return SUCCESS;
-}
-/* }}} */
-
-/* {{{ PHP_RSHUTDOWN_FUNCTION(simplexml)
- */
-PHP_RSHUTDOWN_FUNCTION(simplexml)
-{
return SUCCESS;
}
/* }}} */
+#endif
/* {{{ PHP_MINFO_FUNCTION(simplexml)
*/
@@ -1664,7 +1652,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.101 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.102 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
