- Remove more dead code

diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c
index 437e8b61891f7f3edad382d6094e7a9fee281bbb..4b1725ccf8af5268adff2352bc5310848aa886b7 100755 (executable)
--- a/ext/spl/spl_functions.c
+++ b/ext/spl/spl_functions.c
@@ -27,14 +27,6 @@
 #include "ext/standard/info.h"
 #include "php_spl.h"
 
-/* {{{ spl_destroy_class */
-void spl_destroy_class(zend_class_entry ** ppce)
-{                           
-       SPL_DEBUG(fprintf(stderr, "Destroy(%s): %s\n", (*ppce)->type == ZEND_USER_CLASS ? "user" : "other", (*ppce)->name);)
-       destroy_zend_class(ppce);
-}
-/* }}} */
-
 /* {{{ spl_register_interface */
 void spl_register_interface(zend_class_entry ** ppce, char * class_name, const zend_function_entry * functions TSRMLS_DC)
 {
@@ -77,20 +69,6 @@ PHPAPI void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry *
 }
 /* }}} */
 
-/* {{{ spl_register_parent_ce */
-void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * parent_class TSRMLS_DC)
-{
-       class_entry->parent = parent_class;
-}
-/* }}} */
-
-/* {{{ spl_register_functions */
-void spl_register_functions(zend_class_entry * class_entry, const zend_function_entry * function_list TSRMLS_DC)
-{
-       zend_register_functions(class_entry, function_list, &class_entry->function_table, MODULE_PERSISTENT TSRMLS_CC);
-}
-/* }}} */
-
 /* {{{ spl_register_property */
 void spl_register_property( zend_class_entry * class_entry, char *prop_name, int prop_name_len, int prop_flags TSRMLS_DC)
 {

diff --git a/ext/spl/spl_functions.h b/ext/spl/spl_functions.h
index f45d762f1e721609bec85df502dfd9115c21e844..639da28c937f0ff665292fae6f061cefc7a1a571 100755 (executable)
--- a/ext/spl/spl_functions.h
+++ b/ext/spl/spl_functions.h
@@ -37,33 +37,22 @@ typedef zend_object_value (*create_object_func_t)(zend_class_entry *class_type T
 #define REGISTER_SPL_INTERFACE(class_name) \
        spl_register_interface(&spl_ce_ ## class_name, # class_name, spl_funcs_ ## class_name TSRMLS_CC);
 
-#define REGISTER_SPL_PARENT_CE(class_name, parent_class) \
-       spl_register_parent_ce(spl_ce_ ## class_name, spl_ce_ ## parent_class TSRMLS_CC);
-
 #define REGISTER_SPL_IMPLEMENTS(class_name, interface_name) \
        zend_class_implements(spl_ce_ ## class_name TSRMLS_CC, 1, spl_ce_ ## interface_name);
 
 #define REGISTER_SPL_ITERATOR(class_name) \
        zend_class_implements(spl_ce_ ## class_name TSRMLS_CC, 1, zend_ce_iterator);
 
-#define REGISTER_SPL_FUNCTIONS(class_name, function_list) \
-       spl_register_functions(spl_ce_ ## class_name, function_list TSRMLS_CC);
-
 #define REGISTER_SPL_PROPERTY(class_name, prop_name, prop_flags) \
        spl_register_property(spl_ce_ ## class_name, prop_name, sizeof(prop_name)-1, prop_flags TSRMLS_CC);
 
 #define REGISTER_SPL_CLASS_CONST_LONG(class_name, const_name, value) \
        zend_declare_class_constant_long(spl_ce_ ## class_name, const_name, sizeof(const_name)-1, (long)value TSRMLS_CC);
 
-void spl_destroy_class(zend_class_entry ** ppce);
-
 void spl_register_std_class(zend_class_entry ** ppce, char * class_name, create_object_func_t ctor, const zend_function_entry * function_list TSRMLS_DC);
 void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, create_object_func_t ctor, const zend_function_entry * function_list TSRMLS_DC);
-
 void spl_register_interface(zend_class_entry ** ppce, char * class_name, const zend_function_entry *functions TSRMLS_DC);
 
-void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * parent_class TSRMLS_DC);
-void spl_register_functions(zend_class_entry * class_entry, const zend_function_entry * function_list TSRMLS_DC);
 void spl_register_property( zend_class_entry * class_entry, char *prop_name, int prop_name_len, int prop_flags TSRMLS_DC);
 
 /* sub: whether to allow subclasses/interfaces