summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/SAPI.c1
-rw-r--r--main/alloca.c8
-rw-r--r--main/fopen_wrappers.c2
-rw-r--r--main/internal_functions_win32.c1
-rw-r--r--main/main.c1
-rw-r--r--main/mergesort.c8
-rw-r--r--main/network.c2
-rw-r--r--main/output.c3
-rw-r--r--main/php.h1
-rw-r--r--main/php_content_types.c1
-rw-r--r--main/php_ini.c1
-rw-r--r--main/php_logos.c8
-rw-r--r--main/php_open_temporary_file.c16
-rw-r--r--main/php_sprintf.c8
-rw-r--r--main/php_ticks.c2
-rw-r--r--main/php_variables.c1
-rw-r--r--main/reentrancy.c8
-rw-r--r--main/rfc1867.c1
-rw-r--r--main/safe_mode.c8
-rw-r--r--main/snprintf.c8
-rwxr-xr-xmain/streams.c2
-rw-r--r--main/strlcat.c8
-rw-r--r--main/strlcpy.c8
23 files changed, 99 insertions, 8 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index 8dc5e5890a..d38e70e73f 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -598,4 +598,5 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len)
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/alloca.c b/main/alloca.c
index 7c6cd4f192..ff553f3541 100644
--- a/main/alloca.c
+++ b/main/alloca.c
@@ -488,3 +488,11 @@ i00afunc (long address)
#endif /* no alloca */
#endif /* not GCC version 2 */
#endif /* HAVE_ALLOCA */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index b8f752a84c..208a39eebb 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -545,10 +545,10 @@ PHPAPI char *expand_filepath(const char *filepath, char *real_path)
return real_path;
}
-
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 6a706b58fc..98583f7ca6 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -102,4 +102,5 @@ int php_global_shutdown_internal_extensions(void)
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/main.c b/main/main.c
index a444cbf2c2..10a8d98064 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1293,4 +1293,5 @@ PHPAPI void dummy_indent()
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/mergesort.c b/main/mergesort.c
index c1eb8bc26e..b73b67773b 100644
--- a/main/mergesort.c
+++ b/main/mergesort.c
@@ -342,3 +342,11 @@ static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const voi
swap(u, t);
}
}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/network.c b/main/network.c
index b71225dfa0..ff0d6e7f9b 100644
--- a/main/network.c
+++ b/main/network.c
@@ -332,5 +332,5 @@ int php_hostconnect(char *host, unsigned short port, int socktype, int timeout)
* tab-width: 8
* c-basic-offset: 8
* End:
- * vim: ts=4 sw=4 tw=78
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/output.c b/main/output.c
index d406b7e2ca..1f3f5f9f17 100644
--- a/main/output.c
+++ b/main/output.c
@@ -613,11 +613,10 @@ PHPAPI int php_get_output_start_lineno()
return OG(output_start_lineno);
}
-
-
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/php.h b/main/php.h
index 513edb3fc7..24173462ab 100644
--- a/main/php.h
+++ b/main/php.h
@@ -343,4 +343,5 @@ PHPAPI PHP_FUNCTION(warn_not_available);
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/php_content_types.c b/main/php_content_types.c
index e8efe610d3..81ca39882b 100644
--- a/main/php_content_types.c
+++ b/main/php_content_types.c
@@ -54,4 +54,5 @@ int php_startup_sapi_content_types(void)
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/php_ini.c b/main/php_ini.c
index 38e2c70985..c4b9abb13a 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -348,4 +348,5 @@ PHPAPI int cfg_get_string(char *varname, char **result)
* c-basic-offset: 4
* indent-tabs-mode: t
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/php_logos.c b/main/php_logos.c
index bad0ff9608..f236dc011f 100644
--- a/main/php_logos.c
+++ b/main/php_logos.c
@@ -87,3 +87,11 @@ int php_info_logos(const char *logo_string)
PHPWRITE(logo_image->data, logo_image->size);
return 1;
}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index 6ebcb2ed0f..9cce838814 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -50,7 +50,7 @@
#define P_tmpdir ""
#endif
-/* {{{ php_open_temporary_file */
+/* {{{ php_do_open_temporary_file */
/* Loosely based on a tempnam() implementation by UCLA */
@@ -139,8 +139,11 @@ static FILE *php_do_open_temporary_file(char *path, const char *pfx, char **open
}
return fp;
}
+/* }}} */
-/* Unlike tempnam(), the supplied dir argument takes precedence
+/* {{{ php_open_temporary_file
+ *
+ * Unlike tempnam(), the supplied dir argument takes precedence
* over the TMPDIR environment variable
* This function should do its best to return a file pointer to a newly created
* unique file, on every platform.
@@ -189,3 +192,12 @@ PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **op
return NULL;
}
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/php_sprintf.c b/main/php_sprintf.c
index 9836fc79c3..c91d4da6c5 100644
--- a/main/php_sprintf.c
+++ b/main/php_sprintf.c
@@ -40,3 +40,11 @@ php_sprintf (char*s, const char* format, ...)
}
#endif /* BROKEN_SPRINTF */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/php_ticks.c b/main/php_ticks.c
index b1607d3ccf..5e66bfdd37 100644
--- a/main/php_ticks.c
+++ b/main/php_ticks.c
@@ -71,10 +71,10 @@ void php_run_ticks(int count)
zend_llist_apply_with_argument(&PG(tick_functions), (void(*)(void*,void*))php_tick_iterator, &count);
}
-
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/php_variables.c b/main/php_variables.c
index fd958445d1..b5a2e8d50e 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -333,4 +333,5 @@ void php_import_environment_variables(zval *array_ptr ELS_DC PLS_DC)
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/reentrancy.c b/main/reentrancy.c
index d4049ee77d..e1ff8266d5 100644
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -430,3 +430,11 @@ cont:
}
#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 6c87cc7d6f..1347f9d829 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -479,4 +479,5 @@ SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
* tab-width: 4
* c-basic-offset: 4
* End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/safe_mode.c b/main/safe_mode.c
index 0421ad2c7d..18b2f752c3 100644
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -163,3 +163,11 @@ PHPAPI char *php_get_current_user()
return SG(request_info).current_user;
}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/snprintf.c b/main/snprintf.c
index d5caeff860..1a84a08370 100644
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -938,3 +938,11 @@ int ap_php_vsnprintf(char *buf, size_t len, const char *format, va_list ap)
}
#endif /* HAVE_SNPRINTF */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/streams.c b/main/streams.c
index df0350d266..d4ac991c69 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -355,5 +355,5 @@ exit_success:
* tab-width: 4
* c-basic-offset: 4
* End:
- * vim: tw=78 sw=4 ts=4
+ * vim: sw=4 ts=4 tw=78 fdm=marker
*/
diff --git a/main/strlcat.c b/main/strlcat.c
index 04734f101d..7e4cd9feb0 100644
--- a/main/strlcat.c
+++ b/main/strlcat.c
@@ -75,3 +75,11 @@ PHPAPI size_t php_strlcat(dst, src, siz)
}
#endif /* !HAVE_STRLCAT */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
diff --git a/main/strlcpy.c b/main/strlcpy.c
index 68b5147ac6..6b51ca3a86 100644
--- a/main/strlcpy.c
+++ b/main/strlcpy.c
@@ -72,3 +72,11 @@ PHPAPI size_t php_strlcpy(dst, src, siz)
}
#endif /* !HAVE_STRLCPY */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim: sw=4 ts=4 tw=78 fdm=marker
+ */
View Lorry Controller Status