helly Sun Feb 13 13:30:26 2005 EDT
Modified files:
/php-src/ext/spl php_spl.c
Log:
- Little code reordering
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.39&r2=1.40&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.39 php-src/ext/spl/php_spl.c:1.40
--- php-src/ext/spl/php_spl.c:1.39 Sun Feb 13 13:14:34 2005
+++ php-src/ext/spl/php_spl.c Sun Feb 13 13:30:26 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.39 2005/02/13 18:14:34 helly Exp $ */
+/* $Id: php_spl.c,v 1.40 2005/02/13 18:30:26 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -41,36 +41,6 @@
ZEND_DECLARE_MODULE_GLOBALS(spl)
-/* {{{ spl_functions
- */
-function_entry spl_functions[] = {
- PHP_FE(spl_classes, NULL)
- PHP_FE(class_parents, NULL)
- PHP_FE(class_implements, NULL)
-#ifdef SPL_ITERATORS_H
- PHP_FE(iterator_to_array, NULL)
- PHP_FE(iterator_count, NULL)
-#endif /* SPL_ITERATORS_H */
- {NULL, NULL, NULL}
-};
-/* }}} */
-
-/* {{{ spl_module_entry
- */
-zend_module_entry spl_module_entry = {
- STANDARD_MODULE_HEADER,
- "SPL",
- spl_functions,
- PHP_MINIT(spl),
- NULL,
- NULL,
- NULL,
- PHP_MINFO(spl),
- "0.2",
- STANDARD_MODULE_PROPERTIES
-};
-/* }}} */
-
/* {{{ spl_functions_none
*/
function_entry spl_functions_none[] = {
@@ -85,23 +55,6 @@
}
/* }}} */
-/* {{{ PHP_MINIT_FUNCTION(spl)
- */
-PHP_MINIT_FUNCTION(spl)
-{
- ZEND_INIT_MODULE_GLOBALS(spl, spl_init_globals, NULL);
-
- PHP_MINIT(spl_iterators)(INIT_FUNC_ARGS_PASSTHRU);
- PHP_MINIT(spl_array)(INIT_FUNC_ARGS_PASSTHRU);
- PHP_MINIT(spl_directory)(INIT_FUNC_ARGS_PASSTHRU);
- PHP_MINIT(spl_sxe)(INIT_FUNC_ARGS_PASSTHRU);
- PHP_MINIT(spl_exceptions)(INIT_FUNC_ARGS_PASSTHRU);
- PHP_MINIT(spl_observer)(INIT_FUNC_ARGS_PASSTHRU);
-
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ array class_parents(object instance)
Return an array containing the names of all parent classes */
PHP_FUNCTION(class_parents)
@@ -183,7 +136,7 @@
}
/* }}} */
-int spl_build_class_list_string(zval **entry, char **list TSRMLS_DC)
+int spl_build_class_list_string(zval **entry, char **list TSRMLS_DC) /* {{{ */
{
char *res;
@@ -191,7 +144,7 @@
efree(*list);
*list = res;
return ZEND_HASH_APPLY_KEEP;
-}
+} /* }}} */
/* {{{ PHP_MINFO(spl)
*/
@@ -225,6 +178,53 @@
}
/* }}} */
+/* {{{ spl_functions
+ */
+function_entry spl_functions[] = {
+ PHP_FE(spl_classes, NULL)
+ PHP_FE(class_parents, NULL)
+ PHP_FE(class_implements, NULL)
+#ifdef SPL_ITERATORS_H
+ PHP_FE(iterator_to_array, NULL)
+ PHP_FE(iterator_count, NULL)
+#endif /* SPL_ITERATORS_H */
+ {NULL, NULL, NULL}
+};
+/* }}} */
+
+/* {{{ PHP_MINIT_FUNCTION(spl)
+ */
+PHP_MINIT_FUNCTION(spl)
+{
+ ZEND_INIT_MODULE_GLOBALS(spl, spl_init_globals, NULL);
+
+ PHP_MINIT(spl_iterators)(INIT_FUNC_ARGS_PASSTHRU);
+ PHP_MINIT(spl_array)(INIT_FUNC_ARGS_PASSTHRU);
+ PHP_MINIT(spl_directory)(INIT_FUNC_ARGS_PASSTHRU);
+ PHP_MINIT(spl_sxe)(INIT_FUNC_ARGS_PASSTHRU);
+ PHP_MINIT(spl_exceptions)(INIT_FUNC_ARGS_PASSTHRU);
+ PHP_MINIT(spl_observer)(INIT_FUNC_ARGS_PASSTHRU);
+
+ return SUCCESS;
+}
+/* }}} */
+
+/* {{{ spl_module_entry
+ */
+zend_module_entry spl_module_entry = {
+ STANDARD_MODULE_HEADER,
+ "SPL",
+ spl_functions,
+ PHP_MINIT(spl),
+ NULL,
+ NULL,
+ NULL,
+ PHP_MINFO(spl),
+ "0.2",
+ STANDARD_MODULE_PROPERTIES
+};
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
