diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-02-03 21:23:18 +0100 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-02-03 21:23:18 +0100 |
commit | 623911f993f39ebbe75abe2771fc89faf6b15b9b (patch) | |
tree | de37b0eb6b86f8024362bda8389ecd402b3a5117 /ext/standard | |
parent | 5ded0e8f290a9ae6dcdff0119680d27d0eb01e8a (diff) | |
parent | 92ac598aabd336593a47ed3959f1031674b763e6 (diff) | |
download | php-git-623911f993f39ebbe75abe2771fc89faf6b15b9b.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove local variables
Diffstat (limited to 'ext/standard')
91 files changed, 13 insertions, 676 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index a8532e4191..b84e1e3f86 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -6454,12 +6454,3 @@ PHP_FUNCTION(array_combine) } ZEND_HASH_FOREACH_END(); } /* }}} */ - -/* - * 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/ext/standard/assert.c b/ext/standard/assert.c index 99e56c450f..607704d9a8 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -307,12 +307,3 @@ PHP_FUNCTION(assert_options) RETURN_FALSE; } /* }}} */ - -/* - * 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/ext/standard/base64.c b/ext/standard/base64.c index e911455cfe..3553e79f4e 100644 --- a/ext/standard/base64.c +++ b/ext/standard/base64.c @@ -819,12 +819,3 @@ PHP_FUNCTION(base64_decode) } } /* }}} */ - -/* - * 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/ext/standard/base64.h b/ext/standard/base64.h index b4d6016e97..b0ed3f6dfc 100644 --- a/ext/standard/base64.h +++ b/ext/standard/base64.h @@ -78,10 +78,3 @@ static inline zend_string *php_base64_decode_str(const zend_string *str) { } #endif /* BASE64_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 66c41e1c6b..a8bc5ca649 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -6150,12 +6150,3 @@ PHP_FUNCTION(sys_getloadavg) } /* }}} */ #endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: fdm=marker - * vim: noet sw=4 ts=4 - */ diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 3a88058aae..237517c91f 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -791,12 +791,3 @@ PHP_FUNCTION(get_browser) zend_string_release_ex(lookup_browser_name, 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/ext/standard/crc32.c b/ext/standard/crc32.c index a328600f9d..fb6e85ab07 100644 --- a/ext/standard/crc32.c +++ b/ext/standard/crc32.c @@ -41,12 +41,3 @@ PHP_NAMED_FUNCTION(php_if_crc32) RETVAL_LONG(crc^0xFFFFFFFF); } /* }}} */ - -/* - * 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/ext/standard/crc32.h b/ext/standard/crc32.h index 45b4349f59..300af378fc 100644 --- a/ext/standard/crc32.h +++ b/ext/standard/crc32.h @@ -96,12 +96,3 @@ static const unsigned int crc32tab[256] = { 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, }; - -/* - * 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/ext/standard/credits.c b/ext/standard/credits.c index 47de382db2..8f4c6b95da 100644 --- a/ext/standard/credits.c +++ b/ext/standard/credits.c @@ -128,12 +128,3 @@ PHPAPI void php_print_credits(int flag) /* {{{ */ } } /* }}} */ - -/* - * 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/ext/standard/crypt.c b/ext/standard/crypt.c index 34a06cb520..068d743d1a 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -275,12 +275,3 @@ PHP_FUNCTION(crypt) RETURN_STR(result); } /* }}} */ - -/* - * 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/ext/standard/css.c b/ext/standard/css.c index 2252ee14c6..ac1e2cf4bb 100644 --- a/ext/standard/css.c +++ b/ext/standard/css.c @@ -42,12 +42,3 @@ PHPAPI void php_info_print_css(void) /* {{{ */ PUTS("hr {width: 934px; background-color: #ccc; border: 0; height: 1px;}\n"); } /* }}} */ - -/* - * 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/ext/standard/cyr_convert.c b/ext/standard/cyr_convert.c index 113f925711..e9f45eb61f 100644 --- a/ext/standard/cyr_convert.c +++ b/ext/standard/cyr_convert.c @@ -284,12 +284,3 @@ PHP_FUNCTION(convert_cyr_string) RETVAL_NEW_STR(str); } /* }}} */ - -/* - * 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/ext/standard/datetime.c b/ext/standard/datetime.c index ffc365296c..b1f0f26557 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -106,12 +106,3 @@ PHP_FUNCTION(strptime) /* }}} */ #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/ext/standard/dir.c b/ext/standard/dir.c index 5ddec81381..e81855fc29 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -597,12 +597,3 @@ PHP_FUNCTION(scandir) } } /* }}} */ - -/* - * 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/ext/standard/dl.c b/ext/standard/dl.c index 19b1cf7649..226474efbf 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -267,12 +267,3 @@ PHP_MINFO_FUNCTION(dl) } #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/ext/standard/dns.c b/ext/standard/dns.c index 3d327b48d9..3f34ba67ee 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -1152,12 +1152,3 @@ PHP_MINIT_FUNCTION(dns) { return SUCCESS; } #endif /* HAVE_FULL_DNS_FUNCS */ - -/* - * 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/ext/standard/exec.c b/ext/standard/exec.c index 31a901d675..63e1d97e1d 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -579,12 +579,3 @@ PHP_FUNCTION(proc_nice) } /* }}} */ #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/ext/standard/file.c b/ext/standard/file.c index fea9d7a7cb..70fb6abdeb 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -2467,12 +2467,3 @@ PHP_FUNCTION(sys_get_temp_dir) RETURN_STRING((char *)php_get_temporary_directory()); } /* }}} */ - -/* - * 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/ext/standard/filestat.c b/ext/standard/filestat.c index d39461a98d..bf2bc752b0 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -1134,12 +1134,3 @@ PHP_FUNCTION(realpath_cache_get) buckets++; } } - -/* - * 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/ext/standard/filters.c b/ext/standard/filters.c index a77d90e4b2..5df7c623fd 100644 --- a/ext/standard/filters.c +++ b/ext/standard/filters.c @@ -1947,12 +1947,3 @@ PHP_MSHUTDOWN_FUNCTION(standard_filters) 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/ext/standard/flock_compat.c b/ext/standard/flock_compat.c index fa78b1af01..fd9a2e0985 100644 --- a/ext/standard/flock_compat.c +++ b/ext/standard/flock_compat.c @@ -228,12 +228,3 @@ int inet_aton(const char *cp, struct in_addr *ap) /* }}} */ #endif /* !HAVE_INET_ATON */ #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/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index b224574584..ae1e529f1d 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -833,12 +833,3 @@ PHP_FUNCTION(vfprintf) zend_string_efree(result); } /* }}} */ - -/* - * 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/ext/standard/fsock.c b/ext/standard/fsock.c index 9ec91a78d3..aecca52d0e 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -138,12 +138,3 @@ PHP_FUNCTION(pfsockopen) php_fsockopen_stream(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } /* }}} */ - -/* - * 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/ext/standard/fsock.h b/ext/standard/fsock.h index caf76c8d90..b6fee88d89 100644 --- a/ext/standard/fsock.h +++ b/ext/standard/fsock.h @@ -28,11 +28,4 @@ PHP_FUNCTION(fsockopen); PHP_FUNCTION(pfsockopen); -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim: sw=4 ts=4 - */ #endif /* FSOCK_H */ diff --git a/ext/standard/ftok.c b/ext/standard/ftok.c index 2d87b3005a..9e4af788e3 100644 --- a/ext/standard/ftok.c +++ b/ext/standard/ftok.c @@ -65,10 +65,3 @@ PHP_FUNCTION(ftok) } /* }}} */ #endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 2f64dadbaf..dc97fa83a0 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -1196,13 +1196,3 @@ PHPAPI const php_stream_wrapper php_stream_ftp_wrapper = { NULL, 1 /* is_url */ }; - - -/* - * 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/ext/standard/head.c b/ext/standard/head.c index 52af960611..0ab0293109 100644 --- a/ext/standard/head.c +++ b/ext/standard/head.c @@ -443,11 +443,3 @@ PHP_FUNCTION(http_response_code) RETURN_LONG(SG(sapi_headers).http_response_code); } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 * End: - */ diff --git a/ext/standard/hrtime.c b/ext/standard/hrtime.c index 7aa2eff1c4..2a6707f7bd 100644 --- a/ext/standard/hrtime.c +++ b/ext/standard/hrtime.c @@ -192,12 +192,3 @@ PHPAPI php_hrtime_t php_hrtime_current(void) {/*{{{*/ return _timer_current(); }/*}}}*/ - -/* - * 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/ext/standard/html.c b/ext/standard/html.c index 701a65835e..d69082939c 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -1710,12 +1710,3 @@ PHP_FUNCTION(get_html_translation_table) } } /* }}} */ - -/* - * 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/ext/standard/http.c b/ext/standard/http.c index 218ce805ab..40c53d3b67 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -267,12 +267,3 @@ PHP_FUNCTION(http_build_query) RETURN_NEW_STR(formstr.s); } /* }}} */ - -/* - * 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/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index bd02e88395..611cbccdbe 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -1021,12 +1021,3 @@ PHPAPI const php_stream_wrapper php_stream_http_wrapper = { NULL, 1 /* is_url */ }; - -/* - * 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/ext/standard/image.c b/ext/standard/image.c index 387baf6053..9df5290ad8 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -1533,12 +1533,3 @@ PHP_FUNCTION(getimagesizefromstring) php_getimagesize_from_any(INTERNAL_FUNCTION_PARAM_PASSTHRU, FROM_DATA); } /* }}} */ - -/* - * 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/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c index 2ae96b4a8f..f38fae5f53 100644 --- a/ext/standard/incomplete_class.c +++ b/ext/standard/incomplete_class.c @@ -158,12 +158,3 @@ PHPAPI void php_store_class_name(zval *object, const char *name, size_t len) zend_hash_str_update(Z_OBJPROP_P(object), MAGIC_MEMBER, sizeof(MAGIC_MEMBER)-1, &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/ext/standard/info.c b/ext/standard/info.c index 5c4fc4083d..570c92393c 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -1370,12 +1370,3 @@ PHP_FUNCTION(php_ini_loaded_file) } } /* }}} */ - -/* - * 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/ext/standard/iptc.c b/ext/standard/iptc.c index 0dffdb31d2..f3c17dadd9 100644 --- a/ext/standard/iptc.c +++ b/ext/standard/iptc.c @@ -385,12 +385,3 @@ PHP_FUNCTION(iptcparse) } } /* }}} */ - -/* - * 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/ext/standard/lcg.c b/ext/standard/lcg.c index b16105014f..c649137eb6 100644 --- a/ext/standard/lcg.c +++ b/ext/standard/lcg.c @@ -122,12 +122,3 @@ PHP_FUNCTION(lcg_value) RETURN_DOUBLE(php_combined_lcg()); } /* }}} */ - -/* - * 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/ext/standard/levenshtein.c b/ext/standard/levenshtein.c index 0628054d79..a03e3441cb 100644 --- a/ext/standard/levenshtein.c +++ b/ext/standard/levenshtein.c @@ -131,12 +131,3 @@ PHP_FUNCTION(levenshtein) RETURN_LONG(distance); } /* }}} */ - -/* - * 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/ext/standard/link.c b/ext/standard/link.c index 8231c13f2a..705c293f74 100644 --- a/ext/standard/link.c +++ b/ext/standard/link.c @@ -221,12 +221,3 @@ PHP_FUNCTION(link) /* }}} */ #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/ext/standard/link_win32.c b/ext/standard/link_win32.c index 46ec89dcaa..e8f9e5f852 100644 --- a/ext/standard/link_win32.c +++ b/ext/standard/link_win32.c @@ -225,12 +225,3 @@ PHP_FUNCTION(link) /* }}} */ #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/ext/standard/mail.c b/ext/standard/mail.c index 931c27ce71..53f75bf32a 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -657,12 +657,3 @@ PHP_MINFO_FUNCTION(mail) #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/ext/standard/math.c b/ext/standard/math.c index dfb664c81e..cefcd38769 100644 --- a/ext/standard/math.c +++ b/ext/standard/math.c @@ -1318,12 +1318,3 @@ PHP_FUNCTION(intdiv) RETURN_LONG(dividend / divisor); } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: fdm=marker - * vim: noet sw=4 ts=4 - */ diff --git a/ext/standard/md5.c b/ext/standard/md5.c index f59c3362f1..d6ec2ffa66 100644 --- a/ext/standard/md5.c +++ b/ext/standard/md5.c @@ -389,12 +389,3 @@ PHPAPI void PHP_MD5Final(unsigned char *result, PHP_MD5_CTX *ctx) ZEND_SECURE_ZERO(ctx, sizeof(*ctx)); } - -/* - * 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/ext/standard/metaphone.c b/ext/standard/metaphone.c index 61338390f6..16fd149571 100644 --- a/ext/standard/metaphone.c +++ b/ext/standard/metaphone.c @@ -470,12 +470,3 @@ static int metaphone(unsigned char *word, size_t word_len, zend_long max_phoneme return 0; } /* END metaphone */ /* }}} */ - -/* - * 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/ext/standard/microtime.c b/ext/standard/microtime.c index d68437139e..46d1a7b278 100644 --- a/ext/standard/microtime.c +++ b/ext/standard/microtime.c @@ -156,12 +156,3 @@ PHP_FUNCTION(getrusage) #endif /* HAVE_GETRUSAGE */ /* }}} */ - -/* - * 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/ext/standard/mt_rand.c b/ext/standard/mt_rand.c index dc7b98e315..a176b95231 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -358,12 +358,3 @@ PHP_MINIT_FUNCTION(mt_rand) return SUCCESS; } - -/* - * 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/ext/standard/pack.c b/ext/standard/pack.c index 0f1af1d69e..5f375585d4 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -1331,12 +1331,3 @@ PHP_MINIT_FUNCTION(pack) return SUCCESS; } /* }}} */ - -/* - * 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/ext/standard/pageinfo.c b/ext/standard/pageinfo.c index 5fa00aa130..e0533efdd0 100644 --- a/ext/standard/pageinfo.c +++ b/ext/standard/pageinfo.c @@ -188,12 +188,3 @@ PHP_FUNCTION(getlastmod) } } /* }}} */ - -/*nma - * 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/ext/standard/password.c b/ext/standard/password.c index 1a6f8729c9..4a4d99dc6e 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -681,12 +681,3 @@ PHP_FUNCTION(password_algos) { } ZEND_HASH_FOREACH_END(); } /* }}} */ - -/* - * 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/ext/standard/php_crypt.h b/ext/standard/php_crypt.h index 6bd7dc3abc..38410c9d20 100644 --- a/ext/standard/php_crypt.h +++ b/ext/standard/php_crypt.h @@ -28,10 +28,3 @@ PHP_MSHUTDOWN_FUNCTION(crypt); PHP_RINIT_FUNCTION(crypt); #endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index ab20eb8e9f..36fe523d92 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -441,13 +441,3 @@ PHPAPI const php_stream_wrapper php_stream_php_wrapper = { NULL, 0, /* is_url */ }; - - -/* - * 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/ext/standard/php_http.h b/ext/standard/php_http.h index 9c4b6b4bbf..b8ce4b1722 100644 --- a/ext/standard/php_http.h +++ b/ext/standard/php_http.h @@ -32,12 +32,3 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, PHP_FUNCTION(http_build_query); #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/ext/standard/php_password.h b/ext/standard/php_password.h index 7d02d77b90..ecb34780c7 100644 --- a/ext/standard/php_password.h +++ b/ext/standard/php_password.h @@ -66,11 +66,3 @@ static inline const php_password_algo* php_password_algo_identify(const zend_str #endif - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/standard/php_random.h b/ext/standard/php_random.h index 7660f746c5..3398ddb534 100644 --- a/ext/standard/php_random.h +++ b/ext/standard/php_random.h @@ -49,10 +49,3 @@ extern PHPAPI php_random_globals random_globals; #endif #endif - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h index 30a1ce68c3..615264282e 100644 --- a/ext/standard/php_standard.h +++ b/ext/standard/php_standard.h @@ -66,11 +66,3 @@ #define phpext_standard_ptr basic_functions_module_ptr PHP_MINIT_FUNCTION(standard_filters); PHP_MSHUTDOWN_FUNCTION(standard_filters); - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/standard/php_uuencode.h b/ext/standard/php_uuencode.h index dd17ee54f8..7c350b4f18 100644 --- a/ext/standard/php_uuencode.h +++ b/ext/standard/php_uuencode.h @@ -26,10 +26,3 @@ PHPAPI zend_string *php_uudecode(char *src, size_t src_len); PHPAPI zend_string *php_uuencode(char *src, size_t src_len); #endif /* PHP_UUENCODE_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 0cc2fa9d74..d4cee29452 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -970,12 +970,3 @@ exit_fail: /* }}} */ #endif /* PHP_CAN_SUPPORT_PROC_OPEN */ - -/* - * 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/ext/standard/quot_print.c b/ext/standard/quot_print.c index 34de3a0cd1..336a4cc0bb 100644 --- a/ext/standard/quot_print.c +++ b/ext/standard/quot_print.c @@ -277,12 +277,3 @@ PHP_FUNCTION(quoted_printable_encode) RETURN_STR(new_str); } /* }}} */ - -/* - * 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/ext/standard/rand.c b/ext/standard/rand.c index aa1b33a4ad..8c47a89f4f 100644 --- a/ext/standard/rand.c +++ b/ext/standard/rand.c @@ -68,12 +68,3 @@ PHP_FUNCTION(rand) RETURN_LONG(php_mt_rand_common(min, max)); } /* }}} */ - -/* - * 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/ext/standard/random.c b/ext/standard/random.c index 6d3bfdae4e..f6568a658f 100644 --- a/ext/standard/random.c +++ b/ext/standard/random.c @@ -285,12 +285,3 @@ PHP_FUNCTION(random_int) RETURN_LONG(result); } /* }}} */ - -/* - * 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/ext/standard/scanf.c b/ext/standard/scanf.c index 58bcd13637..b128f0d54f 100644 --- a/ext/standard/scanf.c +++ b/ext/standard/scanf.c @@ -1201,12 +1201,3 @@ static inline void scan_set_error_return(int numVars, zval *return_value) /* {{{ } } /* }}} */ - -/* - * 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/ext/standard/sha1.c b/ext/standard/sha1.c index 5d64e42cb3..886c98cc6b 100644 --- a/ext/standard/sha1.c +++ b/ext/standard/sha1.c @@ -395,12 +395,3 @@ unsigned int len; (((uint32_t) input[j + 1]) << 16) | (((uint32_t) input[j]) << 24); } /* }}} */ - -/* - * 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/ext/standard/soundex.c b/ext/standard/soundex.c index a8125a27b5..0f46fbfdfe 100644 --- a/ext/standard/soundex.c +++ b/ext/standard/soundex.c @@ -104,12 +104,3 @@ PHP_FUNCTION(soundex) RETURN_STRINGL(soundex, _small); } /* }}} */ - -/* - * 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/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index e6eebe3df3..ebb4d2593f 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -1736,12 +1736,3 @@ PHP_FUNCTION(stream_socket_shutdown) } /* }}} */ #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/ext/standard/streamsfuncs.h b/ext/standard/streamsfuncs.h index 2754f4b1c6..bcd2afdcc4 100644 --- a/ext/standard/streamsfuncs.h +++ b/ext/standard/streamsfuncs.h @@ -67,12 +67,3 @@ PHP_FUNCTION(sapi_windows_vt100_support); #if HAVE_SOCKETPAIR PHP_FUNCTION(stream_socket_pair); #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/ext/standard/string.c b/ext/standard/string.c index 5311d73bec..8009889b96 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -6173,12 +6173,3 @@ PHP_FUNCTION(utf8_decode) RETURN_STR(php_utf8_decode(arg, arg_len)); } /* }}} */ - -/* - * 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/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c index 9e54a7f94e..c088fd8438 100644 --- a/ext/standard/strnatcmp.c +++ b/ext/standard/strnatcmp.c @@ -172,12 +172,3 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len } } /* }}} */ - -/* - * 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/ext/standard/syslog.c b/ext/standard/syslog.c index 9a671373b6..29967df34a 100644 --- a/ext/standard/syslog.c +++ b/ext/standard/syslog.c @@ -196,12 +196,3 @@ PHP_FUNCTION(syslog) /* }}} */ #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/ext/standard/tests/file/bug27508.phpt b/ext/standard/tests/file/bug27508.phpt index e342a17348..82cafd735d 100644 --- a/ext/standard/tests/file/bug27508.phpt +++ b/ext/standard/tests/file/bug27508.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #27508 (userspace wrappers have bogus eof indicator) --FILE-- -<?php # vim:ft=php +<?php class FileStream { public $fp; diff --git a/ext/standard/tests/file/fopencookie.phpt b/ext/standard/tests/file/fopencookie.phpt index 79922e31e1..a332d378ca 100644 --- a/ext/standard/tests/file/fopencookie.phpt +++ b/ext/standard/tests/file/fopencookie.phpt @@ -2,7 +2,6 @@ fopencookie detected and working (or cast mechanism works) --FILE-- <?php -# vim600:syn=php: /* This test verifies that the casting mechanism is working correctly. * On systems with fopencookie, a FILE* is created around the user diff --git a/ext/standard/tests/file/userfilters.phpt b/ext/standard/tests/file/userfilters.phpt index 73f87de613..40d1298fc4 100644 --- a/ext/standard/tests/file/userfilters.phpt +++ b/ext/standard/tests/file/userfilters.phpt @@ -2,7 +2,7 @@ stream userfilter test --FILE-- <?php -# vim600:syn=php: + class testfilter extends php_user_filter { function filter($in, $out, &$consumed, $closing) { while ($bucket = stream_bucket_make_writeable($in)) { diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt index 419ecc5122..790b74a0c3 100644 --- a/ext/standard/tests/file/userstreams.phpt +++ b/ext/standard/tests/file/userstreams.phpt @@ -2,7 +2,6 @@ User-space streams --FILE-- <?php -# vim600:syn=php: /* This is a fairly aggressive test that looks at * user streams and also gives the seek/gets/buffer diff --git a/ext/standard/tests/file/userwrapper.phpt b/ext/standard/tests/file/userwrapper.phpt index 3b512a6f36..dd4f0d3dd1 100644 --- a/ext/standard/tests/file/userwrapper.phpt +++ b/ext/standard/tests/file/userwrapper.phpt @@ -1,7 +1,7 @@ --TEST-- Userstream unlink, rename, mkdir, rmdir, and url_stat. --FILE-- -<?php # vim:ft=php: +<?php class test { function unlink($file) { print "Unlinking file: $file\n"; diff --git a/ext/standard/tests/filters/basic.phpt b/ext/standard/tests/filters/basic.phpt index 13a79e2cd1..c9162e5bef 100644 --- a/ext/standard/tests/filters/basic.phpt +++ b/ext/standard/tests/filters/basic.phpt @@ -2,7 +2,6 @@ basic stream filter tests --FILE-- <?php -# vim600:syn=php: $text = "Hello There!"; $filters = array("string.rot13", "string.toupper", "string.tolower"); diff --git a/ext/standard/tests/general_functions/proc_open-mb0.phpt b/ext/standard/tests/general_functions/proc_open-mb0.phpt index f19a9fb576..3b832f6ea4 100644 --- a/ext/standard/tests/general_functions/proc_open-mb0.phpt +++ b/ext/standard/tests/general_functions/proc_open-mb0.phpt @@ -1,7 +1,7 @@ --TEST-- proc_open with bypass_shell subprocess parameter passing --SKIPIF-- -<?php # vim:syn=php +<?php if (!function_exists("proc_open")) echo "skip proc_open() is not available"; ?> --FILE-- diff --git a/ext/standard/tests/general_functions/proc_open-mb1.phpt b/ext/standard/tests/general_functions/proc_open-mb1.phpt index 666779deb5..b91b44a739 100644 --- a/ext/standard/tests/general_functions/proc_open-mb1.phpt +++ b/ext/standard/tests/general_functions/proc_open-mb1.phpt @@ -1,7 +1,7 @@ --TEST-- proc_open without bypass_shell subprocess parameter passing --SKIPIF-- -<?php # vim:syn=php +<?php if (!function_exists("proc_open")) echo "skip proc_open() is not available"; ?> --FILE-- diff --git a/ext/standard/tests/general_functions/proc_open.phpt b/ext/standard/tests/general_functions/proc_open.phpt index ecf8d8ad79..4d0a21d165 100644 --- a/ext/standard/tests/general_functions/proc_open.phpt +++ b/ext/standard/tests/general_functions/proc_open.phpt @@ -1,7 +1,7 @@ --TEST-- proc_open --SKIPIF-- -<?php # vim:syn=php +<?php if (!is_executable("/bin/cat")) echo "skip"; if (!function_exists("proc_open")) echo "skip proc_open() is not available"; ?> diff --git a/ext/standard/tests/math/bug21523.phpt b/ext/standard/tests/math/bug21523.phpt index 7589c401e3..20616b10b3 100644 --- a/ext/standard/tests/math/bug21523.phpt +++ b/ext/standard/tests/math/bug21523.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #21523 (number_format tries to allocate negative amount of memory) --FILE-- -<?php // vim600:syn=php +<?php set_time_limit(5); var_dump(number_format(-2000, 2768)); diff --git a/ext/standard/tests/math/bug24142.phpt b/ext/standard/tests/math/bug24142.phpt index 169932b49b..3696b6e790 100644 --- a/ext/standard/tests/math/bug24142.phpt +++ b/ext/standard/tests/math/bug24142.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #24142 (round() problems) --FILE-- -<?php // vim600:syn=php +<?php $v = 0.005; for ($i = 1; $i < 10; $i++) { echo "round({$v}, 2) -> ".round($v, 2)."\n"; diff --git a/ext/standard/tests/network/bug20134.phpt b/ext/standard/tests/network/bug20134.phpt index e311f892f7..8d97f5f6e8 100644 --- a/ext/standard/tests/network/bug20134.phpt +++ b/ext/standard/tests/network/bug20134.phpt @@ -2,7 +2,7 @@ Bug #20134 (UDP reads from invalid ports) --FILE-- <?php -# vim600:syn=php: + $fp = fsockopen("udp://localhost", 65534, $errno, $errstr); if (!$fp) { /* UDP will never cause a connection error, as it is diff --git a/ext/standard/tests/network/tcp4loop.phpt b/ext/standard/tests/network/tcp4loop.phpt index a163cd9b35..a18fa3ba57 100644 --- a/ext/standard/tests/network/tcp4loop.phpt +++ b/ext/standard/tests/network/tcp4loop.phpt @@ -1,7 +1,7 @@ --TEST-- Streams Based IPv4 TCP Loopback test --FILE-- -<?php # vim:ft=php: +<?php for ($i=0; $i<100; $i++) { $port = rand(10000, 65000); diff --git a/ext/standard/tests/network/udgloop.phpt b/ext/standard/tests/network/udgloop.phpt index 61f8f25135..47ecaf042e 100644 --- a/ext/standard/tests/network/udgloop.phpt +++ b/ext/standard/tests/network/udgloop.phpt @@ -1,7 +1,7 @@ --TEST-- Streams Based Unix Domain Datagram Loopback test --SKIPIF-- -<?php # vim:ft=php: +<?php if (array_search("udg",stream_get_transports()) === false) die('SKIP No support for UNIX domain sockets.'); ?> diff --git a/ext/standard/tests/network/udp6loop.phpt b/ext/standard/tests/network/udp6loop.phpt index 8241d80bac..3b70f43119 100644 --- a/ext/standard/tests/network/udp6loop.phpt +++ b/ext/standard/tests/network/udp6loop.phpt @@ -1,7 +1,7 @@ --TEST-- Streams Based IPv6 UDP Loopback test --SKIPIF-- -<?php # vim:ft=php: +<?php /* If IPv6 is supported on the platform this will error out with code 111 - * Connection refused. If IPv6 is NOT supported, $errno will be set to * something else (indicating parse/getaddrinfo error) diff --git a/ext/standard/tests/network/unixloop.phpt b/ext/standard/tests/network/unixloop.phpt index 83bfbb0667..2e95beb9f5 100644 --- a/ext/standard/tests/network/unixloop.phpt +++ b/ext/standard/tests/network/unixloop.phpt @@ -1,7 +1,7 @@ --TEST-- Streams Based Unix Domain Loopback test --SKIPIF-- -<?php # vim:ft=php: +<?php if (array_search("unix",stream_get_transports()) === false) die('SKIP No support for UNIX domain sockets.'); ?> diff --git a/ext/standard/type.c b/ext/standard/type.c index 59247eeedb..c3d20a340c 100644 --- a/ext/standard/type.c +++ b/ext/standard/type.c @@ -411,12 +411,3 @@ PHP_FUNCTION(is_countable) RETURN_BOOL(zend_is_countable(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/ext/standard/uniqid.c b/ext/standard/uniqid.c index 1d0c346419..97a886c592 100644 --- a/ext/standard/uniqid.c +++ b/ext/standard/uniqid.c @@ -84,12 +84,3 @@ PHP_FUNCTION(uniqid) } #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/ext/standard/url.c b/ext/standard/url.c index bc4a24511d..ff70ea4e04 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -726,12 +726,3 @@ no_name_header: php_stream_close(stream); } /* }}} */ - -/* - * 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/ext/standard/url.h b/ext/standard/url.h index f3e3707bfe..782fe65e6a 100644 --- a/ext/standard/url.h +++ b/ext/standard/url.h @@ -59,10 +59,3 @@ PHP_FUNCTION(get_headers); #define PHP_QUERY_RFC3986 2 #endif /* URL_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index 44ce16b337..34e877707c 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -591,13 +591,3 @@ PHP_FUNCTION(stream_filter_register) } } /* }}} */ - - -/* - * 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/ext/standard/uuencode.c b/ext/standard/uuencode.c index d21ed0034c..bfe605a49b 100644 --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@ -231,12 +231,3 @@ PHP_FUNCTION(convert_uudecode) RETURN_STR(dest); } /* }}} */ - -/* - * 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/ext/standard/var.c b/ext/standard/var.c index 9a61fa82ee..5bf2923561 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -1211,12 +1211,3 @@ PHP_FUNCTION(memory_get_peak_usage) { RETURN_LONG(zend_memory_peak_usage(real_usage)); } /* }}} */ - -/* - * 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/ext/standard/versioning.c b/ext/standard/versioning.c index 3273215091..e4353130d6 100644 --- a/ext/standard/versioning.c +++ b/ext/standard/versioning.c @@ -243,11 +243,3 @@ PHP_FUNCTION(version_compare) } /* }}} */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - */ |