From 8f6a6a800e69a4a0dac359c6bdcc0d4c8f88db9c Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Mon, 4 Feb 2008 19:40:49 +0000 Subject: [PATCH] - MFH Fix/add folding markers --- ext/spl/spl_directory.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index bf1c096ee4..df451b90fc 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1227,7 +1227,7 @@ SPL_METHOD(GlobIterator, count) } /* }}} */ -/* forward declarations to the iterator handlers */ +/* {{{ forward declarations to the iterator handlers */ static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter TSRMLS_DC); static int spl_filesystem_dir_it_valid(zend_object_iterator *iter TSRMLS_DC); static void spl_filesystem_dir_it_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC); @@ -1244,6 +1244,7 @@ zend_object_iterator_funcs spl_filesystem_dir_it_funcs = { spl_filesystem_dir_it_move_forward, spl_filesystem_dir_it_rewind }; +/* }}} */ /* {{{ spl_ce_dir_get_iterator */ zend_object_iterator *spl_filesystem_dir_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) @@ -1276,7 +1277,7 @@ static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter TSRMLS_DC) iterator->intern.data = NULL; /* mark as unused */ } /* }}} */ - + /* {{{ spl_filesystem_dir_it_valid */ static int spl_filesystem_dir_it_valid(zend_object_iterator *iter TSRMLS_DC) { @@ -1286,7 +1287,6 @@ static int spl_filesystem_dir_it_valid(zend_object_iterator *iter TSRMLS_DC) } /* }}} */ - /* {{{ spl_filesystem_dir_it_current_data */ static void spl_filesystem_dir_it_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) { @@ -1345,7 +1345,7 @@ static void spl_filesystem_tree_it_dtor(zend_object_iterator *iter TSRMLS_DC) iterator->intern.data = NULL; /* mark as unused */ } /* }}} */ - + /* {{{ spl_filesystem_tree_it_current_data */ static void spl_filesystem_tree_it_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) { @@ -1430,7 +1430,7 @@ static void spl_filesystem_tree_it_rewind(zend_object_iterator *iter TSRMLS_DC) } /* }}} */ -/* iterator handler table */ +/* {{{ iterator handler table */ zend_object_iterator_funcs spl_filesystem_tree_it_funcs = { spl_filesystem_tree_it_dtor, spl_filesystem_dir_it_valid, @@ -1439,6 +1439,7 @@ zend_object_iterator_funcs spl_filesystem_tree_it_funcs = { spl_filesystem_tree_it_move_forward, spl_filesystem_tree_it_rewind }; +/* }}} */ /* {{{ spl_ce_dir_get_iterator */ zend_object_iterator *spl_filesystem_tree_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) @@ -1482,7 +1483,7 @@ static int spl_filesystem_object_cast(zval *readobj, zval *writeobj, int type TS } /* }}} */ -/* declare method parameters */ +/* {{{ declare method parameters */ /* supply a name and default to call by parameter */ static ZEND_BEGIN_ARG_INFO(arginfo_info___construct, 0) @@ -1597,6 +1598,7 @@ static const zend_function_entry spl_GlobIterator_functions[] = { SPL_ME(GlobIterator, count, NULL, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; +/* }}} */ static int spl_filesystem_file_read(spl_filesystem_object *intern, int silent TSRMLS_DC) /* {{{ */ { @@ -1692,12 +1694,12 @@ static int spl_filesystem_file_call(spl_filesystem_object *intern, zend_function return result; } /* }}} */ -#define FileFunctionCall(func_name, pass_num_args, arg2) \ +#define FileFunctionCall(func_name, pass_num_args, arg2) /* {{{ */ \ { \ zend_function *func_ptr; \ zend_hash_find(EG(function_table), #func_name, sizeof(#func_name), (void **) &func_ptr); \ spl_filesystem_file_call(intern, func_ptr, pass_num_args, return_value, arg2 TSRMLS_CC); \ -} +} /* }}} */ static int spl_filesystem_file_read_csv(spl_filesystem_object *intern, char delimiter, char enclosure, char escape, zval *return_value TSRMLS_DC) /* {{{ */ { @@ -2170,7 +2172,6 @@ SPL_METHOD(SplFileObject, fflush) RETURN_BOOL(!php_stream_flush(intern->u.file.stream)); } /* }}} */ - /* {{{ proto int SplFileObject::ftell() Return current file position */ SPL_METHOD(SplFileObject, ftell) @@ -2500,7 +2501,6 @@ PHP_MINIT_FUNCTION(spl_directory) } /* }}} */ - /* * Local variables: * tab-width: 4 -- 2.40.0