summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-01-22 21:39:32 +0100
committerPeter Kokot <peterkokot@gmail.com>2019-02-03 21:03:00 +0100
commit92ac598aabd336593a47ed3959f1031674b763e6 (patch)
treeeef6b7c4fca17f69cdc9a612b67af4665abf98ed /main
parent020ca5bf2b91f613f86df5e819a0419f8f3c8722 (diff)
downloadphp-git-92ac598aabd336593a47ed3959f1031674b763e6.tar.gz
Remove local variables
This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
Diffstat (limited to 'main')
-rw-r--r--main/SAPI.c9
-rw-r--r--main/SAPI.h9
-rw-r--r--main/alloca.c9
-rw-r--r--main/explicit_bzero.c8
-rw-r--r--main/fastcgi.c9
-rw-r--r--main/fastcgi.h9
-rw-r--r--main/fopen_wrappers.c9
-rw-r--r--main/fopen_wrappers.h8
-rw-r--r--main/getopt.c9
-rw-r--r--main/http_status_codes.h8
-rw-r--r--main/internal_functions.c.in7
-rw-r--r--main/internal_functions_win32.c9
-rw-r--r--main/main.c9
-rw-r--r--main/mergesort.c9
-rw-r--r--main/network.c9
-rw-r--r--main/output.c9
-rw-r--r--main/php.h9
-rw-r--r--main/php_compat.h8
-rw-r--r--main/php_content_types.c9
-rw-r--r--main/php_content_types.h8
-rw-r--r--main/php_getopt.h9
-rw-r--r--main/php_globals.h9
-rw-r--r--main/php_ini.c10
-rw-r--r--main/php_ini.h8
-rw-r--r--main/php_main.h8
-rw-r--r--main/php_memory_streams.h9
-rw-r--r--main/php_network.h9
-rw-r--r--main/php_open_temporary_file.c9
-rw-r--r--main/php_open_temporary_file.h8
-rw-r--r--main/php_output.h9
-rw-r--r--main/php_reentrancy.h8
-rw-r--r--main/php_scandir.c9
-rw-r--r--main/php_scandir.h8
-rw-r--r--main/php_sprintf.c9
-rw-r--r--main/php_stdint.h9
-rw-r--r--main/php_streams.h8
-rw-r--r--main/php_syslog.c9
-rw-r--r--main/php_syslog.h9
-rw-r--r--main/php_ticks.c9
-rw-r--r--main/php_ticks.h9
-rw-r--r--main/php_variables.c9
-rw-r--r--main/php_variables.h8
-rw-r--r--main/reentrancy.c9
-rw-r--r--main/rfc1867.c9
-rw-r--r--main/rfc1867.h8
-rw-r--r--main/snprintf.c9
-rw-r--r--main/snprintf.h9
-rw-r--r--main/spprintf.c9
-rw-r--r--main/spprintf.h9
-rw-r--r--main/streams/cast.c9
-rw-r--r--main/streams/filter.c9
-rw-r--r--main/streams/glob_wrapper.c9
-rw-r--r--main/streams/memory.c9
-rw-r--r--main/streams/mmap.c9
-rw-r--r--main/streams/php_stream_context.h10
-rw-r--r--main/streams/php_stream_filter_api.h9
-rw-r--r--main/streams/php_stream_glob_wrapper.h9
-rw-r--r--main/streams/php_stream_mmap.h9
-rw-r--r--main/streams/php_stream_plain_wrapper.h9
-rw-r--r--main/streams/php_stream_transport.h9
-rw-r--r--main/streams/php_stream_userspace.h9
-rw-r--r--main/streams/plain_wrapper.c9
-rw-r--r--main/streams/streams.c9
-rw-r--r--main/streams/transports.c9
-rw-r--r--main/streams/xp_socket.c10
-rw-r--r--main/strlcat.c9
-rw-r--r--main/strlcpy.c9
67 files changed, 0 insertions, 591 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index bb0b5f884e..0d81731f5c 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -1156,12 +1156,3 @@ SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val
}
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/SAPI.h b/main/SAPI.h
index bf2e32b764..f3479a22e6 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -320,12 +320,3 @@ END_EXTERN_C()
NULL /* input_filter_init */
#endif /* SAPI_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/alloca.c b/main/alloca.c
index 07d1f01af9..480b9b0ab5 100644
--- a/main/alloca.c
+++ b/main/alloca.c
@@ -484,12 +484,3 @@ i00afunc (long address)
#endif /* no alloca */
#endif /* not GCC version 2 */
#endif /* HAVE_ALLOCA */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/explicit_bzero.c b/main/explicit_bzero.c
index f1f7ae0955..57d12080c6 100644
--- a/main/explicit_bzero.c
+++ b/main/explicit_bzero.c
@@ -46,11 +46,3 @@ PHPAPI void php_explicit_bzero(void *dst, size_t siz)
#endif
}
#endif
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/fastcgi.c b/main/fastcgi.c
index 26f1decbc6..cc66de7344 100644
--- a/main/fastcgi.c
+++ b/main/fastcgi.c
@@ -1769,12 +1769,3 @@ const char *fcgi_get_last_client_ip()
/* Unix socket */
return NULL;
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/fastcgi.h b/main/fastcgi.h
index 757b3fb791..95aae11e41 100644
--- a/main/fastcgi.h
+++ b/main/fastcgi.h
@@ -126,12 +126,3 @@ void fcgi_impersonate(void);
void fcgi_set_mgmt_var(const char * name, size_t name_len, const char * value, size_t value_len);
void fcgi_free_mgmt_var_cb(zval *zv);
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 9efe52124c..b0bfa4feda 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -828,12 +828,3 @@ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, co
return real_path;
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h
index c2b4984e58..17e15b7df0 100644
--- a/main/fopen_wrappers.h
+++ b/main/fopen_wrappers.h
@@ -47,11 +47,3 @@ PHPAPI ZEND_INI_MH(OnUpdateBaseDir);
END_EXTERN_C()
#endif
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/getopt.c b/main/getopt.c
index 38a0b9df25..c01a726e99 100644
--- a/main/getopt.c
+++ b/main/getopt.c
@@ -194,12 +194,3 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
return(0); /* never reached */
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/http_status_codes.h b/main/http_status_codes.h
index 861253de99..5d5cfb08c3 100644
--- a/main/http_status_codes.h
+++ b/main/http_status_codes.h
@@ -80,11 +80,3 @@ static const http_response_status_code_pair http_status_map[] = {
static const size_t http_status_map_len = (sizeof(http_status_map) / sizeof(http_response_status_code_pair)) - 1;
#endif /* HTTP_STATUS_CODES_H */
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 235e44fa59..7e73e6874f 100644
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@ -37,10 +37,3 @@ PHPAPI int php_register_internal_extensions(void)
{
return php_register_extensions(php_builtin_extensions, EXTCOUNT);
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index fc638ebeff..45093ec739 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -185,12 +185,3 @@ PHPAPI int php_register_internal_extensions(void)
{
return php_register_extensions(php_builtin_extensions, EXTCOUNT);
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/main.c b/main/main.c
index c17fbfc79e..3e472bf393 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2772,12 +2772,3 @@ PHPAPI int php_lint_script(zend_file_handle *file)
return retval;
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/mergesort.c b/main/mergesort.c
index d187635367..da6d8560bf 100644
--- a/main/mergesort.c
+++ b/main/mergesort.c
@@ -345,12 +345,3 @@ static void insertionsort(u_char *a, size_t n, size_t size, int (*cmp)(const voi
}
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: fdm=marker
- * vim: noet sw=4 ts=4
- */
diff --git a/main/network.c b/main/network.c
index 5f7c909d1f..60ce19f9df 100644
--- a/main/network.c
+++ b/main/network.c
@@ -1319,12 +1319,3 @@ PHPAPI struct hostent* php_network_gethostbyname(char *name) {
return gethostname_re(name, &FG(tmp_host_info), &FG(tmp_host_buf), &FG(tmp_host_buf_len));
#endif
}
-
-/*
- * Local variables:
- * tab-width: 8
- * c-basic-offset: 8
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/output.c b/main/output.c
index 622a835228..49e2535333 100644
--- a/main/output.c
+++ b/main/output.c
@@ -1565,12 +1565,3 @@ PHP_FUNCTION(output_add_rewrite_var)
}
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php.h b/main/php.h
index 92cfe5923e..f182bb8932 100644
--- a/main/php.h
+++ b/main/php.h
@@ -501,12 +501,3 @@ END_EXTERN_C()
#endif /* !XtOffsetOf */
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_compat.h b/main/php_compat.h
index 82cca93495..01d3e326c5 100644
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -400,11 +400,3 @@
#endif
#endif
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_content_types.c b/main/php_content_types.c
index 8f5867bf0e..b53ee1ab84 100644
--- a/main/php_content_types.c
+++ b/main/php_content_types.c
@@ -64,12 +64,3 @@ int php_setup_sapi_content_types(void)
return SUCCESS;
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_content_types.h b/main/php_content_types.h
index d97500ded5..145e8d4c5e 100644
--- a/main/php_content_types.h
+++ b/main/php_content_types.h
@@ -27,11 +27,3 @@ int php_startup_sapi_content_types(void);
int php_setup_sapi_content_types(void);
#endif /* PHP_CONTENT_TYPES_H */
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_getopt.h b/main/php_getopt.h
index 89130a146c..20746517d4 100644
--- a/main/php_getopt.h
+++ b/main/php_getopt.h
@@ -36,12 +36,3 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
END_EXTERN_C()
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/php_globals.h b/main/php_globals.h
index cb6e73a149..ad24618eae 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -173,12 +173,3 @@ struct _php_core_globals {
#endif /* PHP_GLOBALS_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_ini.c b/main/php_ini.c
index d74a59b311..7d4e916432 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -946,13 +946,3 @@ PHPAPI HashTable* php_ini_get_configuration_hash(void) /* {{{ */
{
return &configuration_hash;
} /* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * indent-tabs-mode: t
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_ini.h b/main/php_ini.h
index c96ae72552..a4fad6c689 100644
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -87,11 +87,3 @@ END_EXTERN_C()
#define php_ini_string zend_ini_string
#endif /* PHP_INI_H */
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_main.h b/main/php_main.h
index 674cac44e3..8f440de820 100644
--- a/main/php_main.h
+++ b/main/php_main.h
@@ -52,11 +52,3 @@ extern int php_shutdown_environ(void);
END_EXTERN_C()
#endif
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_memory_streams.h b/main/php_memory_streams.h
index 3905869b94..7db25dd1dd 100644
--- a/main/php_memory_streams.h
+++ b/main/php_memory_streams.h
@@ -63,12 +63,3 @@ extern PHPAPI const php_stream_wrapper php_stream_rfc2397_wrapper;
#define PHP_STREAM_IS_TEMP &php_stream_temp_ops
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_network.h b/main/php_network.h
index 6c0e9cebe7..241ca94e27 100644
--- a/main/php_network.h
+++ b/main/php_network.h
@@ -337,12 +337,3 @@ END_EXTERN_C()
#endif
#endif /* _PHP_NETWORK_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index 61abffe1a8..6fca7e4cab 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -342,12 +342,3 @@ PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, zend_stri
return fp;
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_open_temporary_file.h b/main/php_open_temporary_file.h
index 18c19488b6..0195056e31 100644
--- a/main/php_open_temporary_file.h
+++ b/main/php_open_temporary_file.h
@@ -30,11 +30,3 @@ PHPAPI const char *php_get_temporary_directory(void);
END_EXTERN_C()
#endif /* PHP_OPEN_TEMPORARY_FILE_H */
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_output.h b/main/php_output.h
index a24b7696b2..f76d61d841 100644
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -262,12 +262,3 @@ PHP_FUNCTION(output_add_rewrite_var);
PHP_FUNCTION(output_reset_rewrite_vars);
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_reentrancy.h b/main/php_reentrancy.h
index c06206fa53..7ff35418bc 100644
--- a/main/php_reentrancy.h
+++ b/main/php_reentrancy.h
@@ -129,11 +129,3 @@ void reentrancy_shutdown(void);
#endif
#endif
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_scandir.c b/main/php_scandir.c
index dfa0a19d9d..94f5ef899d 100644
--- a/main/php_scandir.c
+++ b/main/php_scandir.c
@@ -119,12 +119,3 @@ fail:
return -1;
}
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_scandir.h b/main/php_scandir.h
index 556b6151e9..04bf29f2c9 100644
--- a/main/php_scandir.h
+++ b/main/php_scandir.h
@@ -46,11 +46,3 @@ PHPAPI int php_alphasort(const struct dirent **a, const struct dirent **b);
#endif
#endif /* PHP_SCANDIR_H */
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_sprintf.c b/main/php_sprintf.c
index fd870410c9..41e632102d 100644
--- a/main/php_sprintf.c
+++ b/main/php_sprintf.c
@@ -37,12 +37,3 @@ php_sprintf (char*s, const char* format, ...)
va_end (args);
return (ret < 0) ? -1 : ret;
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_stdint.h b/main/php_stdint.h
index 6fa65a786a..3e5fd0016c 100644
--- a/main/php_stdint.h
+++ b/main/php_stdint.h
@@ -218,12 +218,3 @@ typedef unsigned long long uint64_t;
#endif /* !PHP_WIN32 */
#endif /* PHP_STDINT_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_streams.h b/main/php_streams.h
index 8bbe9a64ef..7c49099bb0 100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -606,11 +606,3 @@ END_EXTERN_C()
#define PHP_STREAM_META_GROUP_NAME 4
#define PHP_STREAM_META_GROUP 5
#define PHP_STREAM_META_ACCESS 6
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_syslog.c b/main/php_syslog.c
index 2170ac70be..8b3aaceff7 100644
--- a/main/php_syslog.c
+++ b/main/php_syslog.c
@@ -108,12 +108,3 @@ PHPAPI void php_syslog(int priority, const char *format, ...) /* {{{ */
}
/* }}} */
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_syslog.h b/main/php_syslog.h
index 076e00cbe3..b5df765ddd 100644
--- a/main/php_syslog.h
+++ b/main/php_syslog.h
@@ -41,12 +41,3 @@ PHPAPI void php_openlog(const char *, int, int);
END_EXTERN_C()
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_ticks.c b/main/php_ticks.c
index 76e3bce4a6..f5b0dd0c58 100644
--- a/main/php_ticks.c
+++ b/main/php_ticks.c
@@ -70,12 +70,3 @@ void php_run_ticks(int count)
{
zend_llist_apply_with_argument(&PG(tick_functions), (llist_apply_with_arg_func_t) php_tick_iterator, &count);
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_ticks.h b/main/php_ticks.h
index 668dee0e18..5b2bb057e6 100644
--- a/main/php_ticks.h
+++ b/main/php_ticks.h
@@ -30,12 +30,3 @@ PHPAPI void php_remove_tick_function(void (*func)(int, void *), void * arg);
END_EXTERN_C()
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_variables.c b/main/php_variables.c
index 0102f8c29c..decf73a80f 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -915,12 +915,3 @@ void php_startup_auto_globals(void)
zend_register_auto_global(zend_string_init_interned("_REQUEST", sizeof("_REQUEST")-1, 1), PG(auto_globals_jit), php_auto_globals_create_request);
zend_register_auto_global(zend_string_init_interned("_FILES", sizeof("_FILES")-1, 1), 0, php_auto_globals_create_files);
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/php_variables.h b/main/php_variables.h
index a994347c04..7dc33d328a 100644
--- a/main/php_variables.h
+++ b/main/php_variables.h
@@ -46,11 +46,3 @@ END_EXTERN_C()
#define NUM_TRACK_VARS 6
#endif /* PHP_VARIABLES_H */
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/reentrancy.c b/main/reentrancy.c
index 4db65a276e..12e2548666 100644
--- a/main/reentrancy.c
+++ b/main/reentrancy.c
@@ -425,12 +425,3 @@ cont:
}
#endif
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/rfc1867.c b/main/rfc1867.c
index c1ed1d704e..1ee7b925a1 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -1331,12 +1331,3 @@ SAPI_API void php_rfc1867_set_multibyte_callbacks(
php_rfc1867_basename = basename;
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/rfc1867.h b/main/rfc1867.h
index 2b4049c8c6..bfb9bb51c6 100644
--- a/main/rfc1867.h
+++ b/main/rfc1867.h
@@ -87,11 +87,3 @@ SAPI_API void php_rfc1867_set_multibyte_callbacks(
php_rfc1867_basename_t basename);
#endif /* RFC1867_H */
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/snprintf.c b/main/snprintf.c
index 8975cb0290..15ed08175e 100644
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -1341,12 +1341,3 @@ PHPAPI int ap_php_asprintf(char **buf, const char *format, ...) /* {{{ */
return cc;
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/snprintf.h b/main/snprintf.h
index 012665d91f..39284aeaa4 100644
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -170,12 +170,3 @@ PHPAPI char * ap_php_conv_p2(u_wide_int num, int nbits,
#define FORMAT_CONV_MAX_PRECISION 500
#endif /* SNPRINTF_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/spprintf.c b/main/spprintf.c
index d5231da0f1..193da18c0a 100644
--- a/main/spprintf.c
+++ b/main/spprintf.c
@@ -836,12 +836,3 @@ PHPAPI void php_printf_to_smart_str(smart_str *buf, const char *format, va_list
xbuf_format_converter(buf, 0, format, ap);
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/spprintf.h b/main/spprintf.h
index 6cd41d7bdf..0bfc5a28cd 100644
--- a/main/spprintf.h
+++ b/main/spprintf.h
@@ -34,12 +34,3 @@ END_EXTERN_C()
#define vstrpprintf zend_vstrpprintf
#endif /* SNPRINTF_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/streams/cast.c b/main/streams/cast.c
index e41d663272..59832c54a8 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -404,12 +404,3 @@ PHPAPI int _php_stream_make_seekable(php_stream *origstream, php_stream **newstr
return PHP_STREAM_RELEASED;
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/filter.c b/main/streams/filter.c
index a4d0d49da2..afc1f3b8e5 100644
--- a/main/streams/filter.c
+++ b/main/streams/filter.c
@@ -503,12 +503,3 @@ PHPAPI php_stream_filter *php_stream_filter_remove(php_stream_filter *filter, in
}
return filter;
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c
index 6ee9eeec92..b0ff40a7c5 100644
--- a/main/streams/glob_wrapper.c
+++ b/main/streams/glob_wrapper.c
@@ -279,12 +279,3 @@ const php_stream_wrapper php_glob_stream_wrapper = {
0
};
#endif /* HAVE_GLOB */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/memory.c b/main/streams/memory.c
index 506c97fd31..b63ed77255 100644
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -789,12 +789,3 @@ PHPAPI const php_stream_wrapper php_stream_rfc2397_wrapper = {
NULL,
1, /* is_url */
};
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/mmap.c b/main/streams/mmap.c
index 9c4a53ae2f..8f3fcf97a6 100644
--- a/main/streams/mmap.c
+++ b/main/streams/mmap.c
@@ -62,12 +62,3 @@ PHPAPI int _php_stream_mmap_unmap_ex(php_stream *stream, zend_off_t readden)
return ret;
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/php_stream_context.h b/main/streams/php_stream_context.h
index ef5c0e1635..c477dda4ac 100644
--- a/main/streams/php_stream_context.h
+++ b/main/streams/php_stream_context.h
@@ -114,13 +114,3 @@ END_EXTERN_C()
#define php_stream_notify_error(context, code, xmsg, xcode) do { if ((context) && (context)->notifier) {\
php_stream_notification_notify((context), (code), PHP_STREAM_NOTIFY_SEVERITY_ERR, \
(xmsg), (xcode), 0, 0, NULL); } } while(0)
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h
index f76301c2b6..4d5760e2cf 100644
--- a/main/streams/php_stream_filter_api.h
+++ b/main/streams/php_stream_filter_api.h
@@ -149,12 +149,3 @@ PHPAPI int php_stream_filter_unregister_factory(const char *filterpattern);
PHPAPI int php_stream_filter_register_factory_volatile(zend_string *filterpattern, const php_stream_filter_factory *factory);
PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval *filterparams, uint8_t persistent);
END_EXTERN_C()
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/streams/php_stream_glob_wrapper.h b/main/streams/php_stream_glob_wrapper.h
index a255719b3f..31ba5b2ca0 100644
--- a/main/streams/php_stream_glob_wrapper.h
+++ b/main/streams/php_stream_glob_wrapper.h
@@ -31,12 +31,3 @@ PHPAPI int _php_glob_stream_get_count(php_stream *stream, int *pflags STREAMS_
#define php_glob_stream_get_count(stream, pflags) _php_glob_stream_get_count((stream), (pflags) STREAMS_CC)
END_EXTERN_C()
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/streams/php_stream_mmap.h b/main/streams/php_stream_mmap.h
index 0357e2403b..132f3214c1 100644
--- a/main/streams/php_stream_mmap.h
+++ b/main/streams/php_stream_mmap.h
@@ -75,12 +75,3 @@ PHPAPI int _php_stream_mmap_unmap(php_stream *stream);
PHPAPI int _php_stream_mmap_unmap_ex(php_stream *stream, zend_off_t readden);
#define php_stream_mmap_unmap_ex(stream, readden) _php_stream_mmap_unmap_ex((stream), (readden))
END_EXTERN_C()
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/php_stream_plain_wrapper.h b/main/streams/php_stream_plain_wrapper.h
index ac2dabf7f7..4af8b86cdd 100644
--- a/main/streams/php_stream_plain_wrapper.h
+++ b/main/streams/php_stream_plain_wrapper.h
@@ -56,12 +56,3 @@ PHPAPI FILE * _php_stream_open_wrapper_as_file(char * path, char * mode, int opt
PHPAPI int php_stream_parse_fopen_modes(const char *mode, int *open_flags);
END_EXTERN_C()
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/streams/php_stream_transport.h b/main/streams/php_stream_transport.h
index cbbaf091bd..a73966ec33 100644
--- a/main/streams/php_stream_transport.h
+++ b/main/streams/php_stream_transport.h
@@ -214,12 +214,3 @@ BEGIN_EXTERN_C()
PHPAPI HashTable *php_stream_xport_get_hash(void);
PHPAPI php_stream_transport_factory_func php_stream_generic_socket_factory;
END_EXTERN_C()
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/php_stream_userspace.h b/main/streams/php_stream_userspace.h
index c09ff9033a..389d591921 100644
--- a/main/streams/php_stream_userspace.h
+++ b/main/streams/php_stream_userspace.h
@@ -21,12 +21,3 @@ PHPAPI extern const php_stream_ops php_stream_userspace_ops;
PHPAPI extern const php_stream_ops php_stream_userspace_dir_ops;
#define PHP_STREAM_IS_USERSPACE &php_stream_userspace_ops
#define PHP_STREAM_IS_USERSPACE_DIR &php_stream_userspace_dir_ops
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index bb777b8e65..6ac47b25fd 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -1600,12 +1600,3 @@ stream_skip:
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/streams.c b/main/streams/streams.c
index 7c8d0ac906..f418991bad 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -2290,12 +2290,3 @@ PHPAPI int _php_stream_scandir(const char *dirname, zend_string **namelist[], in
return nfiles;
}
/* }}} */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/transports.c b/main/streams/transports.c
index 05dbdcad60..74fbef58d8 100644
--- a/main/streams/transports.c
+++ b/main/streams/transports.c
@@ -512,12 +512,3 @@ PHPAPI int php_stream_xport_shutdown(php_stream *stream, stream_shutdown_t how)
}
return -1;
}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index b7770c842d..f79fa16d5f 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -925,13 +925,3 @@ PHPAPI php_stream *php_stream_generic_socket_factory(const char *proto, size_t p
return stream;
}
-
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: noet sw=4 ts=4 fdm=marker
- * vim<600: noet sw=4 ts=4
- */
diff --git a/main/strlcat.c b/main/strlcat.c
index 4d0e0e6142..6ef5644568 100644
--- a/main/strlcat.c
+++ b/main/strlcat.c
@@ -94,12 +94,3 @@ PHPAPI size_t php_strlcat(dst, src, siz)
}
#endif /* !HAVE_STRLCAT */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */
diff --git a/main/strlcpy.c b/main/strlcpy.c
index 82436e1d1f..31e13489d8 100644
--- a/main/strlcpy.c
+++ b/main/strlcpy.c
@@ -94,12 +94,3 @@ PHPAPI size_t php_strlcpy(dst, src, siz)
}
#endif /* !HAVE_STRLCPY */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
- */