helly Sat Dec 6 15:24:33 2008 UTC
Modified files:
/php-src/ext/spl spl_functions.c spl_functions.h
Log:
- Remove more dead code
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.c?r1=1.42&r2=1.43&diff_format=u
Index: php-src/ext/spl/spl_functions.c
diff -u php-src/ext/spl/spl_functions.c:1.42
php-src/ext/spl/spl_functions.c:1.43
--- php-src/ext/spl/spl_functions.c:1.42 Mon Dec 31 07:12:15 2007
+++ php-src/ext/spl/spl_functions.c Sat Dec 6 15:24:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_functions.c,v 1.42 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: spl_functions.c,v 1.43 2008/12/06 15:24:33 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -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 @@
}
/* }}} */
-/* {{{ 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)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.h?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/spl/spl_functions.h
diff -u php-src/ext/spl/spl_functions.h:1.28
php-src/ext/spl/spl_functions.h:1.29
--- php-src/ext/spl/spl_functions.h:1.28 Mon Dec 31 07:12:15 2007
+++ php-src/ext/spl/spl_functions.h Sat Dec 6 15:24:33 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_functions.h,v 1.28 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: spl_functions.h,v 1.29 2008/12/06 15:24:33 helly Exp $ */
#ifndef PHP_FUNCTIONS_H
#define PHP_FUNCTIONS_H
@@ -37,33 +37,22 @@
#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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
