Fold a bit more code

8 files changed, 86 insertions, 30 deletions

diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c
index b2f9a613c1..d0fa13cf16 100644
--- a/ext/icap/php_icap.c
+++ b/ext/icap/php_icap.c
@@ -1,33 +1,23 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP HTML Embedded Scripting Language Version 3.0                     |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-1999 PHP Development Team (See Credits file)      |
+   | Copyright (c) 1997-2001 The PHP Group                                |
    +----------------------------------------------------------------------+
-   | This program is free software; you can redistribute it and/or modify |
-   | it under the terms of one of the following licenses:                 |
-   |                                                                      |
-   |  A) the GNU General Public License as published by the Free Software |
-   |     Foundation; either version 2 of the License, or (at your option) |
-   |     any later version.                                               |
-   |                                                                      |
-   |  B) the PHP License as published by the PHP Development Team and     |
-   |     included in the distribution in the file: LICENSE                |
-   |                                                                      |
-   | This program is distributed in the hope that it will be useful,      |
-   | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
-   | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
-   | GNU General Public License for more details.                         |
-   |                                                                      |
-   | You should have received a copy of both licenses referred to here.   |
-   | If you did not, or have any questions about PHP licensing, please    |
-   | contact core@php.net.                                                |
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Authors:                                                             |
-   |          Mark Musone         <musone@chek.com>                  |
+   | Authors: Mark Musone <musone@chek.com>                               |
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
+
 #define ICAP1
 
 #ifdef ERROR
@@ -938,10 +928,11 @@ void cc_vdlog(const char *fmt,va_list ap)
 
 #endif
 
-
 /*
- * Local_ variables:
+ * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
  * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
  */
diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index ae80bf51b1..152ca079d0 100644
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -18,7 +18,6 @@
 */
 
 /* $Id$ */
-/* Id: pdf.c,v 1.73 2001/02/26 06:07:11 andi Exp  */
 
 /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE.
    Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */
@@ -3157,4 +3156,6 @@ PHP_FUNCTION(pdf_setmatrix) {
  * tab-width: 4
  * c-basic-offset: 4
  * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
  */
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index bf0c74338d..5894289165 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
+
 #include "php.h"
 
 #include <sys/stat.h>
@@ -336,3 +338,12 @@ PS_GC_FUNC(files)
 	
 	return SUCCESS;
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
+ */
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
index 987684e2d2..b6f4b52465 100644
--- a/ext/session/mod_mm.c
+++ b/ext/session/mod_mm.c
@@ -16,6 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
 
 #include "php.h"
 
@@ -353,3 +354,12 @@ zend_module_entry php_session_mm_module = {
 };
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
+ */
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
index 7064908f93..be4e89d50e 100644
--- a/ext/session/mod_user.c
+++ b/ext/session/mod_user.c
@@ -16,6 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
+
 #include "php.h"
 #include "php_session.h"
 #include "mod_user.h"
@@ -172,3 +174,12 @@ PS_GC_FUNC(user)
 
 	FINISH;
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
+ */
diff --git a/ext/session/session.c b/ext/session/session.c
index ce3d9f781a..f66d151cbc 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -17,6 +17,8 @@
    +----------------------------------------------------------------------+
  */
 
+/* $Id$ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -49,6 +51,8 @@
 #include "mod_files.h"
 #include "mod_user.h"
 
+/* {{{ session_functions[]
+ */
 function_entry session_functions[] = {
 	PHP_FE(session_name, NULL)
 	PHP_FE(session_module_name, NULL)
@@ -69,6 +73,7 @@ function_entry session_functions[] = {
 	PHP_FE(session_write_close, NULL)
 	{0}
 };
+/* }}} */
 
 #ifdef ZTS
 int ps_globals_id;
@@ -103,7 +108,8 @@ static PHP_INI_MH(OnUpdateSerializer)
 }
 
 
-
+/* {{{ PHP_INI
+ */
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("session.save_path",			"/tmp",			PHP_INI_ALL, OnUpdateString,		save_path,			php_ps_globals,	ps_globals)
 	STD_PHP_INI_ENTRY("session.name",				"PHPSESSID",	PHP_INI_ALL, OnUpdateString,		session_name,		php_ps_globals,	ps_globals)
@@ -125,6 +131,7 @@ PHP_INI_BEGIN()
 	/* Commented out until future discussion */
 	/* PHP_INI_ENTRY("session.encode_sources", "globals,track", PHP_INI_ALL, NULL) */
 PHP_INI_END()
+/* }}} */
 
 PS_SERIALIZER_FUNCS(php);
 PS_SERIALIZER_FUNCS(php_binary);
@@ -1142,7 +1149,6 @@ PHP_FUNCTION(session_cache_limiter)
 }
 /* }}} */
 
-
 /* {{{ static void php_register_var(zval** entry PSLS_DC PLS_DC) */
 static void php_register_var(zval** entry PSLS_DC PLS_DC)
 {
@@ -1164,7 +1170,6 @@ static void php_register_var(zval** entry PSLS_DC PLS_DC)
 }
 /* }}} */
 
-
 /* {{{ proto bool session_register(mixed var_names [, mixed ...])
    Adds varname(s) to the list of variables which are freezed at the session end */
 PHP_FUNCTION(session_register)
@@ -1219,7 +1224,6 @@ PHP_FUNCTION(session_unregister)
 }
 /* }}} */
 
-
 /* {{{ proto bool session_is_registered(string varname)
    Checks if a variable is registered in session */
 PHP_FUNCTION(session_is_registered)
@@ -1242,7 +1246,6 @@ PHP_FUNCTION(session_is_registered)
 }
 /* }}} */
 
-
 /* {{{ proto string session_encode(void)
    Serializes the current setup and returns the serialized representation */
 PHP_FUNCTION(session_encode)
@@ -1443,3 +1446,12 @@ PHP_MINFO_FUNCTION(session)
 
 	DISPLAY_INI_ENTRIES();
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
+ */
diff --git a/ext/vpopmail/php_vpopmail.c b/ext/vpopmail/php_vpopmail.c
index 7f859396fa..30d5428168 100644
--- a/ext/vpopmail/php_vpopmail.c
+++ b/ext/vpopmail/php_vpopmail.c
@@ -942,4 +942,6 @@ PHP_FUNCTION(vpopmail_error)
  * tab-width: 4
  * c-basic-offset: 4
  * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
  */
diff --git a/ext/yp/yp.c b/ext/yp/yp.c
index 82ba26b22d..672fe100de 100644
--- a/ext/yp/yp.c
+++ b/ext/yp/yp.c
@@ -215,6 +215,8 @@ PHP_FUNCTION(yp_next) {
 }
 /* }}} */
 
+/* {{{ php_foreach_all
+ */
 static int php_foreach_all (int instatus, char *inkey, int inkeylen, char *inval, int invallen, char *indata)
 {
 	int r;
@@ -253,6 +255,7 @@ static int php_foreach_all (int instatus, char *inkey, int inkeylen, char *inval
 
 	return r;
 }
+/* }}} */
 
 /* {{{ proto void yp_all(string domain, string map, string callback)
    Traverse the map and call a function on each entry */
@@ -276,6 +279,8 @@ PHP_FUNCTION(yp_all) {
 }
 /* }}} */
 
+/* {{{ php_foreach_cat
+ */
 static int php_foreach_cat (int instatus, char *inkey, int inkeylen, char *inval, int invallen, char *indata)
 {
 	int err;
@@ -299,6 +304,7 @@ static int php_foreach_cat (int instatus, char *inkey, int inkeylen, char *inval
 
 	return 0;
 }
+/* }}} */
 
 /* {{{ proto array yp_cat(string domain, string map)
    Return an array containing the entire map */
@@ -355,6 +361,8 @@ PHP_FUNCTION(yp_err_string) {
 }
 /* }}} */
 
+/* {{{ PHP_MINIT_FUNCTION
+ */
 PHP_MINIT_FUNCTION(yp)
 {
 #ifdef ZTS
@@ -379,6 +387,7 @@ PHP_MINIT_FUNCTION(yp)
 
 	return SUCCESS;
 }
+/* }}} */
 
 PHP_RINIT_FUNCTION(yp)
 {
@@ -392,3 +401,12 @@ PHP_MINFO_FUNCTION(yp) {
 	php_info_print_table_end();
 }
 #endif /* HAVE_YP */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
+ */