vim-6 does folding - clean up a bunch of missing folding tags plus

some misguided RINIT and RSHUTDOWN calls in a few fringe extensions

Author: rlerdorf

CODING_STANDARDS

@@ -171,11 +171,10 @@ PHP_FUNCTION(abs)
 /* }}} */
 
 The {{{ symbols are the default folding symbols for the folding mode in
-Emacs.  vim will soon have support for folding as well.  Folding is very
-useful when dealing with large files because you can scroll through the 
-file quickly and just unfold the function you wish to work on.  The }}}
-at the end of each function marks the end of the fold, and should be on
-a separate line.
+Emacs and vim (set fdm=marker).  Folding is very useful when dealing with 
+large files because you can scroll through the file quickly and just unfold 
+the function you wish to work on.  The }}} at the end of each function marks 
+the end of the fold, and should be on a separate line.
 
 The "proto" keyword there is just a helper for the doc/genfuncsummary script
 which generates a full function summary.  Having this keyword in front of the

ext/aspell/aspell.c

@@ -37,38 +37,44 @@
 #include <aspell-c.h>
 #include "ext/standard/info.h"
 
+/* {{{ aspell_functions[]
+ */
 function_entry aspell_functions[] = {
 	PHP_FE(aspell_new,								NULL)
 	PHP_FE(aspell_check,							NULL)
 	PHP_FE(aspell_check_raw,						NULL)
 	PHP_FE(aspell_suggest,							NULL)
 	{NULL, NULL, NULL}
 };
+/* }}} */
 
 static int le_aspell;
 
 zend_module_entry aspell_module_entry = {
 	"aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES
 };
 
-
 #ifdef COMPILE_DL_ASPELL
 ZEND_GET_MODULE(aspell)
 #endif
 
+/* {{{ php_aspell_close
+ */
 static void php_aspell_close(zend_rsrc_list_entry *rsrc)
 {
 	aspell *sc = (aspell *)rsrc->ptr;
 	aspell_free(sc);
 }
+/* }}} */
 
-
+/* {{{ PHP_MINIT_FUNCTION
+ */
 PHP_MINIT_FUNCTION(aspell)
 {
     le_aspell = zend_register_list_destructors_ex(php_aspell_close, NULL, "aspell", module_number);
 	return SUCCESS;
-
 }
+/* }}} */
 
 /* {{{ proto int aspell_new(string master [, string personal])
    Load a dictionary */
@@ -97,7 +103,6 @@ PHP_FUNCTION(aspell_new)
 }
 /* }}} */
 
-
 /* {{{ proto array aspell_suggest(aspell int, string word)
    Return array of Suggestions */
 PHP_FUNCTION(aspell_suggest)
@@ -199,11 +204,22 @@ PHP_FUNCTION(aspell_check_raw)
 }
 /* }}} */
 
+/* {{{ PHP_MINFO_FUNCTION
+ */
 PHP_MINFO_FUNCTION(aspell)
 {
 	php_info_print_table_start();
 	php_info_print_table_row(2, "ASpell Support", "enabled");
 	php_info_print_table_end();
 }
+/* }}} */
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */

ext/crack/crack.c

@@ -259,4 +259,5 @@ ZEND_FUNCTION(crack_getlastmessage)
  * tab-width: 4
  * c-basic-offset: 4
  * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
  */

ext/ctype/ctype.c

@@ -41,8 +41,9 @@ ZEND_DECLARE_MODULE_GLOBALS(ctype)
 /* True global resources - no need for thread safety here */
 static int le_ctype;
 
-/* Every user visible function must have an entry in ctype_functions[].
-*/
+/* {{{ ctype_functions[]
+ * Every user visible function must have an entry in ctype_functions[].
+ */
 function_entry ctype_functions[] = {
 	PHP_FE(ctype_alnum,	NULL)
 	PHP_FE(ctype_alpha,	NULL)
@@ -57,7 +58,10 @@ function_entry ctype_functions[] = {
 	PHP_FE(ctype_xdigit,	NULL)
 	{NULL, NULL, NULL}	/* Must be the last line in ctype_functions[] */
 };
+/* }}} */
 
+/* {{{ ctype_mpodule_entry
+ */
 zend_module_entry ctype_module_entry = {
 	"ctype",
 	ctype_functions,
@@ -68,6 +72,7 @@ zend_module_entry ctype_module_entry = {
 	PHP_MINFO(ctype),
 	STANDARD_MODULE_PROPERTIES
 };
+/* }}} */
 
 #ifdef COMPILE_DL_CTYPE
 ZEND_GET_MODULE(ctype)
@@ -77,7 +82,8 @@ ZEND_GET_MODULE(ctype)
 #define PHP_EXPERIMENTAL(x,y)
 #endif 
 
-
+/* {{{ PHP_MINFO_FUNCTION
+ */
 PHP_MINFO_FUNCTION(ctype)
 {
 	ELS_FETCH();
@@ -87,8 +93,10 @@ PHP_MINFO_FUNCTION(ctype)
 	php_info_print_table_row(2, "ctype functions", "enabled (experimental)");
 	php_info_print_table_end();
 }
+/* }}} */
 
-
+/* {{{ ctype
+ */
 static int ctype(int (*iswhat)(int),zval **c) 
 {
 	switch ((*c)->type) {
@@ -111,6 +119,7 @@ static int ctype(int (*iswhat)(int),zval **c)
 	}
 	return 0;
 }
+/* }}} */
 
 /* {{{ proto bool isalnum(mixed c)
     Check for alphanumeric character(s) */
@@ -310,13 +319,12 @@ PHP_FUNCTION(ctype_xdigit)
 }
 /* }}} */
 
-
 #endif	/* HAVE_CTYPE */
 
-
 /*
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
  * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
  */

ext/curl/curl.c

@@ -48,6 +48,8 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc);
 
 #define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err;
 
+/* {{{ curl_functions[]
+ */
 function_entry curl_functions[] = {
 	PHP_FE(curl_init,     NULL)
 	PHP_FE(curl_version,  NULL)
@@ -59,7 +61,10 @@ function_entry curl_functions[] = {
 	PHP_FE(curl_close,    NULL)
 	{NULL, NULL, NULL}
 };
+/* }}} */
 
+/* {{{ curl_module_entry
+ */
 zend_module_entry curl_module_entry = {
 	"curl",
 	curl_functions,
@@ -70,21 +75,27 @@ zend_module_entry curl_module_entry = {
 	PHP_MINFO(curl),
 	STANDARD_MODULE_PROPERTIES
 };
+/* }}} */
 
 #ifdef COMPILE_DL_CURL
 ZEND_GET_MODULE (curl)
 #endif
 
+/* {{{ PHP_MINFO_FUNCTION
+ */
 PHP_MINFO_FUNCTION(curl)
 {
 	php_info_print_table_start();
 	php_info_print_table_row(2, "CURL support",    "enabled");
 	php_info_print_table_row(2, "CURL Information", curl_version());
 	php_info_print_table_end();
 }
+/* }}} */
 
 #define REGISTER_CURL_CONSTANT(name, value) REGISTER_LONG_CONSTANT(name, value, CONST_CS | CONST_PERSISTENT)
 
+/* {{{ PHP_MINIT_FUNCTION
+ */
 PHP_MINIT_FUNCTION(curl)
 {
 	le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number);
@@ -230,6 +241,7 @@ PHP_MINIT_FUNCTION(curl)
 
 	return SUCCESS;
 }
+/* }}} */
 
 #define PHP_CURL_STDOUT 0
 #define PHP_CURL_FILE   1
@@ -239,6 +251,8 @@ PHP_MINIT_FUNCTION(curl)
 #define PHP_CURL_ASCII  5
 #define PHP_CURL_BINARY 6
 
+/* {{{ curl_write
+ */
 static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 {
 	php_curl       *ch     = (php_curl *) ctx;
@@ -290,7 +304,10 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
 
 	return length;
 }
+/* }}} */
 
+/* {{{ curl_read
+ */
 static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
 {
 	php_curl       *ch = (php_curl *) ctx;
@@ -341,7 +358,10 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
 
 	return length;
 }
+/* }}} */
 
+/* {{{ _php_curl_write_header
+ */
 static size_t _php_curl_write_header(char *data, size_t size, size_t nmemb, void *ctx)
 {
 	php_curl  *ch   = (php_curl *) ctx;
@@ -377,7 +397,10 @@ static size_t _php_curl_write_header(char *data, size_t size, size_t nmemb, void
 
 	return length;
 }
+/* }}} */
 
+/* {{{ _php_curl_passwd
+ */
 static size_t _php_curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
 {
 	php_curl    *ch   = (php_curl *) ctx;
@@ -419,23 +442,31 @@ static size_t _php_curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
 
 	return 0;
 }
-	
-	
+/* }}} */
 
+/* {{{ curl_free_string
+ */
 static void curl_free_string(void **string)
 {
 	efree(*string);
-}
+}	
+/* }}} */
 
+/* {{{ curl_free_post
+ */
 static void curl_free_post(void **post)
 {
 	curl_formfree((struct HttpPost *) *post);
 }
+/* }}} */
 
+/* {{{ curl_free_slist
+ */
 static void curl_free_slist(void **slist)
 {
 	curl_slist_free_all((struct curl_slist *) *slist);
 }
+/* }}} */
 
 /* {{{ proto string curl_version(void)
    Return the CURL version string. */
@@ -445,6 +476,8 @@ PHP_FUNCTION(curl_version)
 }
 /* }}} */
 
+/* {{{ alloc_curl_handle
+ */
 static void alloc_curl_handle(php_curl **ch)
 {
 	*ch                    = emalloc(sizeof(php_curl));
@@ -459,6 +492,7 @@ static void alloc_curl_handle(php_curl **ch)
 	zend_llist_init(&(*ch)->to_free.post, sizeof(struct HttpPost),
 	                (void(*)(void *)) curl_free_post, 0);
 }
+/* }}} */
 
 /* {{{ proto int curl_init([string url])
    Initialize a CURL session */
@@ -939,3 +973,11 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc)
 /* }}} */
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */