diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-01-22 21:39:32 +0100 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-02-03 21:03:00 +0100 |
commit | 92ac598aabd336593a47ed3959f1031674b763e6 (patch) | |
tree | eef6b7c4fca17f69cdc9a612b67af4665abf98ed /main/streams | |
parent | 020ca5bf2b91f613f86df5e819a0419f8f3c8722 (diff) | |
download | php-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/streams')
-rw-r--r-- | main/streams/cast.c | 9 | ||||
-rw-r--r-- | main/streams/filter.c | 9 | ||||
-rw-r--r-- | main/streams/glob_wrapper.c | 9 | ||||
-rw-r--r-- | main/streams/memory.c | 9 | ||||
-rw-r--r-- | main/streams/mmap.c | 9 | ||||
-rw-r--r-- | main/streams/php_stream_context.h | 10 | ||||
-rw-r--r-- | main/streams/php_stream_filter_api.h | 9 | ||||
-rw-r--r-- | main/streams/php_stream_glob_wrapper.h | 9 | ||||
-rw-r--r-- | main/streams/php_stream_mmap.h | 9 | ||||
-rw-r--r-- | main/streams/php_stream_plain_wrapper.h | 9 | ||||
-rw-r--r-- | main/streams/php_stream_transport.h | 9 | ||||
-rw-r--r-- | main/streams/php_stream_userspace.h | 9 | ||||
-rw-r--r-- | main/streams/plain_wrapper.c | 9 | ||||
-rw-r--r-- | main/streams/streams.c | 9 | ||||
-rw-r--r-- | main/streams/transports.c | 9 | ||||
-rw-r--r-- | main/streams/xp_socket.c | 10 |
16 files changed, 0 insertions, 146 deletions
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 - */ |