diff options
431 files changed, 91 insertions, 575 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 6d04b51f60..901145010f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,4 +1,3 @@ - version: "{branch}.build.{build}" image: Visual Studio 2017 @@ -50,4 +49,3 @@ build_script: test_script: - appveyor\test.bat - diff --git a/Makefile.frag b/Makefile.frag index cbea640966..7c65cfab3c 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,4 +1,3 @@ - # # Zend # diff --git a/Makefile.gcov b/Makefile.gcov index 55f794138d..514aa58b38 100644 --- a/Makefile.gcov +++ b/Makefile.gcov @@ -1,4 +1,3 @@ - # # LCOV # diff --git a/README.EXT_SKEL b/README.EXT_SKEL index 1b4dc12ba3..ea450c045a 100644 --- a/README.EXT_SKEL +++ b/README.EXT_SKEL @@ -41,4 +41,3 @@ SOURCE AND HEADER FILE NAME OTHER OPTIONS Run php ext_skel.php --help to see the available options. - diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS index 824fe833ac..d3cc8de804 100644 --- a/README.RELEASE_PROCESS +++ b/README.RELEASE_PROCESS @@ -373,4 +373,3 @@ New Release Manager Checklist 5. Request moderation access to announce@php.net and primary-qa-tester@lists.php.net lists, to be able to moderate your release announcements. All the announcements should be sent from the @php.net alias. - diff --git a/README.SELF-CONTAINED-EXTENSIONS b/README.SELF-CONTAINED-EXTENSIONS index 6fb89746b3..0cc097f90c 100644 --- a/README.SELF-CONTAINED-EXTENSIONS +++ b/README.SELF-CONTAINED-EXTENSIONS @@ -164,4 +164,3 @@ PECL SITE CONFORMITY This macros has to be used within your foo_module_entry to indicate the extension version. - diff --git a/README.WIN32-BUILD-SYSTEM b/README.WIN32-BUILD-SYSTEM index bc113a0340..e46d0e4210 100644 --- a/README.WIN32-BUILD-SYSTEM +++ b/README.WIN32-BUILD-SYSTEM @@ -3,4 +3,3 @@ The Win32 Build System. See https://wiki.php.net/internals/windows/stepbystepbuild_sdk_2 vim:tw=78:sw=1:ts=1:et - @@ -37,4 +37,3 @@ Guidelines for contributors - [README.GIT-RULES](/README.GIT-RULES) - [README.MAILINGLIST_RULES](/README.MAILINGLIST_RULES) - [README.RELEASE_PROCESS](/README.RELEASE_PROCESS) - diff --git a/TSRM/config.w32 b/TSRM/config.w32 index 03a21b30cc..c65a91cc97 100644 --- a/TSRM/config.w32 +++ b/TSRM/config.w32 @@ -2,4 +2,3 @@ ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c"); ADD_FLAG("CFLAGS_BD_TSRM", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); - diff --git a/Zend/Makefile.am b/Zend/Makefile.am index dc62bf681c..537deb26f9 100644 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@ -53,4 +53,3 @@ depend: zend_execute.lo: $(srcdir)/zend_execute.c $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c - diff --git a/Zend/buildconf b/Zend/buildconf index fe8dee6f76..b2e0a2958c 100755 --- a/Zend/buildconf +++ b/Zend/buildconf @@ -30,4 +30,3 @@ if cmp configure.old configure > /dev/null 2>&1; then else echo "buildconf: created or modified ${1}configure" fi - diff --git a/Zend/tests/bug40236.inc b/Zend/tests/bug40236.inc index fc03349f7e..a8b97e691e 100644 --- a/Zend/tests/bug40236.inc +++ b/Zend/tests/bug40236.inc @@ -7,4 +7,4 @@ function func5() { } function func6() { } function func7() { } print ("ok\n"); -?>
\ No newline at end of file +?> diff --git a/Zend/tests/nowdoc.inc b/Zend/tests/nowdoc.inc index 98f9fbaacf..c903740e24 100644 --- a/Zend/tests/nowdoc.inc +++ b/Zend/tests/nowdoc.inc @@ -8,4 +8,3 @@ class d { public function __construct() { $this->d = 4; } }; $d = new d; ?> - diff --git a/Zend/tests/return_types/classes.php.inc b/Zend/tests/return_types/classes.php.inc index e4b691e353..34abd8490a 100644 --- a/Zend/tests/return_types/classes.php.inc +++ b/Zend/tests/return_types/classes.php.inc @@ -2,4 +2,3 @@ class A {} class B extends A {} - diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c index fb489b6e7a..e3c6d0acac 100644 --- a/Zend/zend_highlight.c +++ b/Zend/zend_highlight.c @@ -238,4 +238,3 @@ ZEND_API void zend_strip(void) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index dfe25bce70..30f0017cbd 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -120,4 +120,3 @@ ZEND_API int zend_vm_kind(void) { return ZEND_VM_KIND; } - diff --git a/acinclude.m4 b/acinclude.m4 index 168c465f8d..e6f58ed8b1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3235,4 +3235,3 @@ m4_include([build/ax_check_compile_flag.m4]) m4_include([build/ax_gcc_func_attribute.m4]) m4_include([build/php_cxx_compile_stdcxx.m4]) - diff --git a/appveyor/build.bat b/appveyor/build.bat index 36e8fbdd4e..0beee511ee 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -42,4 +42,3 @@ cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\build_task.bat if %errorlevel% neq 0 exit /b 3 exit /b 0 - diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat index 913a4ccef4..0070393694 100644 --- a/appveyor/build_task.bat +++ b/appveyor/build_task.bat @@ -69,4 +69,3 @@ nmake /NOLOGO if %errorlevel% neq 0 exit /b 3 exit /b 0 - diff --git a/appveyor/test.bat b/appveyor/test.bat index eb61bece66..6d4c5fa408 100644 --- a/appveyor/test.bat +++ b/appveyor/test.bat @@ -10,4 +10,3 @@ cmd /c %SDK_RUNNER% -t %APPVEYOR_BUILD_FOLDER%\appveyor\test_task.bat if %errorlevel% neq 0 exit /b 3 exit /b 0 - diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat index 49a0b2dcfe..12aff53031 100644 --- a/appveyor/test_task.bat +++ b/appveyor/test_task.bat @@ -98,4 +98,3 @@ set EXIT_CODE=%errorlevel% powershell -Command "$wc = New-Object 'System.Net.WebClient'; $wc.UploadFile('https://ci.appveyor.com/api/testresults/junit/%APPVEYOR_JOB_ID%', 'c:\junit.out.xml')" exit /b %EXIT_CODE% - diff --git a/build/build2.mk b/build/build2.mk index a5e4d6578d..7b86f3de1a 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -49,4 +49,3 @@ configure: aclocal.m4 configure.ac $(config_m4_files) @echo rebuilding $@ @rm -f $@ $(PHP_AUTOCONF) -f $(SUPPRESS_WARNINGS) - diff --git a/build/genif.sh b/build/genif.sh index 40024322a9..1df7c93164 100755 --- a/build/genif.sh +++ b/build/genif.sh @@ -37,5 +37,3 @@ cat $infile | \ -e "s'@EXT_MODULE_PTRS@'$module_ptrs'" \ -e 's/@NEWLINE@/\ /g' - - diff --git a/buildconf.bat b/buildconf.bat index 27a4bcb2d1..698d80a823 100644 --- a/buildconf.bat +++ b/buildconf.bat @@ -4,4 +4,4 @@ SET PHP_BUILDCONF_PATH=%~dp0 copy %PHP_BUILDCONF_PATH%\win32\build\configure.bat %PHP_BUILDCONF_PATH% > nul SET PHP_SDK_SCRIPT_PATH= -IF NOT EXIST %PHP_BUILDCONF_PATH% (echo Error generating configure script, configure script was not copied) ELSE (echo Now run 'configure --help')
\ No newline at end of file +IF NOT EXIST %PHP_BUILDCONF_PATH% (echo Error generating configure script, configure script was not copied) ELSE (echo Now run 'configure --help') diff --git a/ext/bcmath/libbcmath/AUTHORS b/ext/bcmath/libbcmath/AUTHORS index 982db9dc40..f2d831cf65 100644 --- a/ext/bcmath/libbcmath/AUTHORS +++ b/ext/bcmath/libbcmath/AUTHORS @@ -1,3 +1 @@ Phil Nelson <philnelson@acm.org> wrote bcmath library. - - diff --git a/ext/bcmath/libbcmath/COPYING.LIB b/ext/bcmath/libbcmath/COPYING.LIB index c4792dd27a..aa4f4aca85 100644 --- a/ext/bcmath/libbcmath/COPYING.LIB +++ b/ext/bcmath/libbcmath/COPYING.LIB @@ -1,4 +1,3 @@ - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 @@ -511,5 +510,3 @@ Random Hacker. Ty Coon, President of Vice That's all there is to it! - - diff --git a/ext/bcmath/libbcmath/ChangeLog b/ext/bcmath/libbcmath/ChangeLog index b8d459a2bb..eea6b016e2 100644 --- a/ext/bcmath/libbcmath/ChangeLog +++ b/ext/bcmath/libbcmath/ChangeLog @@ -7,4 +7,3 @@ Wed Jun 7 09:39:02 2000 Phil Nelson <phil@cs.wwu.edu> 2000-05-21 Phil Nelson <phil@cs.wwu.edu> * Initial setup of bcmath library., calling it version 0.1. - diff --git a/ext/bcmath/libbcmath/FAQ b/ext/bcmath/libbcmath/FAQ index 1b06b301ba..423600ac76 100644 --- a/ext/bcmath/libbcmath/FAQ +++ b/ext/bcmath/libbcmath/FAQ @@ -18,4 +18,3 @@ calculate an exact number of digits after the decimal point regardless of the number of digits in the integer part. GMP floats have a "fixed, but arbitrary" mantissa and so multiplying two floats will end up dropping digits BC must calculate. - diff --git a/ext/bcmath/libbcmath/src/add.c b/ext/bcmath/libbcmath/src/add.c index d41ea01914..389fe8e43d 100644 --- a/ext/bcmath/libbcmath/src/add.c +++ b/ext/bcmath/libbcmath/src/add.c @@ -84,4 +84,3 @@ bc_add (n1, n2, result, scale_min) bc_free_num (result); *result = sum; } - diff --git a/ext/bcmath/libbcmath/src/compare.c b/ext/bcmath/libbcmath/src/compare.c index ced7ec1916..f65f697585 100644 --- a/ext/bcmath/libbcmath/src/compare.c +++ b/ext/bcmath/libbcmath/src/compare.c @@ -157,4 +157,3 @@ bc_compare (n1, n2) { return _bc_do_compare (n1, n2, TRUE, FALSE); } - diff --git a/ext/bcmath/libbcmath/src/div.c b/ext/bcmath/libbcmath/src/div.c index a8039f2b76..1be9a09b5c 100644 --- a/ext/bcmath/libbcmath/src/div.c +++ b/ext/bcmath/libbcmath/src/div.c @@ -267,4 +267,3 @@ bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale) return 0; /* Everything is OK. */ } - diff --git a/ext/bcmath/libbcmath/src/divmod.c b/ext/bcmath/libbcmath/src/divmod.c index 6ee6c255cb..b376bb46b7 100644 --- a/ext/bcmath/libbcmath/src/divmod.c +++ b/ext/bcmath/libbcmath/src/divmod.c @@ -83,4 +83,3 @@ bc_modulo (bc_num num1, bc_num num2, bc_num *result, int scale) { return bc_divmod (num1, num2, NULL, result, scale); } - diff --git a/ext/bcmath/libbcmath/src/doaddsub.c b/ext/bcmath/libbcmath/src/doaddsub.c index dc0ba0614b..e0db6a99b9 100644 --- a/ext/bcmath/libbcmath/src/doaddsub.c +++ b/ext/bcmath/libbcmath/src/doaddsub.c @@ -228,4 +228,3 @@ _bc_do_sub (n1, n2, scale_min) _bc_rm_leading_zeros (diff); return diff; } - diff --git a/ext/bcmath/libbcmath/src/int2num.c b/ext/bcmath/libbcmath/src/int2num.c index 12a3342c39..8da0c8e0ed 100644 --- a/ext/bcmath/libbcmath/src/int2num.c +++ b/ext/bcmath/libbcmath/src/int2num.c @@ -80,4 +80,3 @@ bc_int2num (num, val) while (ix-- > 0) *vptr++ = *--bptr; } - diff --git a/ext/bcmath/libbcmath/src/nearzero.c b/ext/bcmath/libbcmath/src/nearzero.c index 041c7e149d..44d0582d79 100644 --- a/ext/bcmath/libbcmath/src/nearzero.c +++ b/ext/bcmath/libbcmath/src/nearzero.c @@ -65,4 +65,3 @@ bc_is_near_zero (num, scale) else return TRUE; } - diff --git a/ext/bcmath/libbcmath/src/neg.c b/ext/bcmath/libbcmath/src/neg.c index 8c00905598..aeebd0bbb8 100644 --- a/ext/bcmath/libbcmath/src/neg.c +++ b/ext/bcmath/libbcmath/src/neg.c @@ -45,4 +45,3 @@ bc_is_neg (num) { return num->n_sign == MINUS; } - diff --git a/ext/bcmath/libbcmath/src/num2long.c b/ext/bcmath/libbcmath/src/num2long.c index 2cef6791c4..3974dcf286 100644 --- a/ext/bcmath/libbcmath/src/num2long.c +++ b/ext/bcmath/libbcmath/src/num2long.c @@ -66,4 +66,3 @@ bc_num2long (num) else return (-val); } - diff --git a/ext/bcmath/libbcmath/src/raise.c b/ext/bcmath/libbcmath/src/raise.c index 4b938cb3b3..51ce6b99f0 100644 --- a/ext/bcmath/libbcmath/src/raise.c +++ b/ext/bcmath/libbcmath/src/raise.c @@ -120,4 +120,3 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale) } bc_free_num (&power); } - diff --git a/ext/bcmath/libbcmath/src/rmzero.c b/ext/bcmath/libbcmath/src/rmzero.c index 4751099d24..b9ecc75720 100644 --- a/ext/bcmath/libbcmath/src/rmzero.c +++ b/ext/bcmath/libbcmath/src/rmzero.c @@ -51,4 +51,3 @@ _bc_rm_leading_zeros (num) num->n_len--; } } - diff --git a/ext/bcmath/libbcmath/src/sqrt.c b/ext/bcmath/libbcmath/src/sqrt.c index ffb19fc519..d37d26b8ca 100644 --- a/ext/bcmath/libbcmath/src/sqrt.c +++ b/ext/bcmath/libbcmath/src/sqrt.c @@ -125,4 +125,3 @@ bc_sqrt (bc_num *num, int scale) bc_free_num (&diff); return 1; } - diff --git a/ext/bcmath/libbcmath/src/str2num.c b/ext/bcmath/libbcmath/src/str2num.c index abf68eb1e5..9750c4720c 100644 --- a/ext/bcmath/libbcmath/src/str2num.c +++ b/ext/bcmath/libbcmath/src/str2num.c @@ -108,4 +108,3 @@ bc_str2num (bc_num *num, char *str, int scale) if (bc_is_zero (*num)) (*num)->n_sign = PLUS; } - diff --git a/ext/bcmath/libbcmath/src/sub.c b/ext/bcmath/libbcmath/src/sub.c index 86c876d1c6..7392de6385 100644 --- a/ext/bcmath/libbcmath/src/sub.c +++ b/ext/bcmath/libbcmath/src/sub.c @@ -86,4 +86,3 @@ bc_sub (n1, n2, result, scale_min) bc_free_num (result); *result = diff; } - diff --git a/ext/bcmath/libbcmath/src/zero.c b/ext/bcmath/libbcmath/src/zero.c index 6f0e93a026..1e7f1ccdd4 100644 --- a/ext/bcmath/libbcmath/src/zero.c +++ b/ext/bcmath/libbcmath/src/zero.c @@ -60,4 +60,3 @@ bc_is_zero (bc_num num) else return TRUE; } - diff --git a/ext/calendar/dow.c b/ext/calendar/dow.c index 466fb3be92..2e47bb352d 100644 --- a/ext/calendar/dow.c +++ b/ext/calendar/dow.c @@ -1,4 +1,3 @@ - /* $selId: dow.c,v 2.0 1995/10/24 01:13:06 lees Exp $ * Copyright 1993-1995, Scott E. Lee, all rights reserved. * Permission granted to use, copy, modify, distribute and sell so long as diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c index ed1deb9691..e0d217b395 100644 --- a/ext/com_dotnet/com_iterator.c +++ b/ext/com_dotnet/com_iterator.c @@ -242,4 +242,3 @@ fail: } return NULL; } - diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index 2c7556b5f9..e5b390bca6 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -562,4 +562,3 @@ zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *objec return &I->iter; } - diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c index cde987bb8b..0ba344fd9e 100644 --- a/ext/com_dotnet/com_typeinfo.c +++ b/ext/com_dotnet/com_typeinfo.c @@ -601,5 +601,3 @@ int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int pri return ret; } - - diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c index e2b515caad..58adf94d8f 100644 --- a/ext/com_dotnet/com_variant.c +++ b/ext/com_dotnet/com_variant.c @@ -1121,4 +1121,3 @@ PHP_FUNCTION(variant_cast) VariantClear(&vres); } /* }}} */ - diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c index 13366aa3c4..437c7c814f 100644 --- a/ext/com_dotnet/com_wrapper.c +++ b/ext/com_dotnet/com_wrapper.c @@ -643,5 +643,3 @@ PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val) return (IDispatch*)disp; } - - diff --git a/ext/curl/tests/server.inc b/ext/curl/tests/server.inc index 124e0f898c..b7c1570195 100644 --- a/ext/curl/tests/server.inc +++ b/ext/curl/tests/server.inc @@ -83,4 +83,3 @@ function curl_cli_server_start() { return PHP_CURL_SERVER_ADDRESS; } - diff --git a/ext/dba/CREDITS b/ext/dba/CREDITS index 370b3ea271..e7748197ea 100644 --- a/ext/dba/CREDITS +++ b/ext/dba/CREDITS @@ -1,2 +1,2 @@ DBA -Sascha Schumann, Marcus Boerger
\ No newline at end of file +Sascha Schumann, Marcus Boerger diff --git a/ext/dba/README b/ext/dba/README index 3d23fb914c..ec0610b71f 100644 --- a/ext/dba/README +++ b/ext/dba/README @@ -51,4 +51,4 @@ This shows whether your combination of handlers works. Most problematic are dbm and ndbm which conflict with many installations. The reason for this is that on several systems these libraries are part of more than one other library. The configuration test only prevents you from configuring -malfaunctioning single handlers but not combinations.
\ No newline at end of file +malfaunctioning single handlers but not combinations. diff --git a/ext/dba/tests/dba_handler.inc b/ext/dba/tests/dba_handler.inc index 9792f00829..51f27050ca 100644 --- a/ext/dba/tests/dba_handler.inc +++ b/ext/dba/tests/dba_handler.inc @@ -95,4 +95,4 @@ do { } } while(1); -?>
\ No newline at end of file +?> diff --git a/ext/dom/tests/bug67081_0.xml b/ext/dom/tests/bug67081_0.xml index 604eea57b1..160e9d31c3 100644 --- a/ext/dom/tests/bug67081_0.xml +++ b/ext/dom/tests/bug67081_0.xml @@ -3,4 +3,3 @@ <!ELEMENT a EMPTY> ]> <a></a> - diff --git a/ext/dom/tests/bug67081_1.xml b/ext/dom/tests/bug67081_1.xml index 7ae542e977..f699805f64 100644 --- a/ext/dom/tests/bug67081_1.xml +++ b/ext/dom/tests/bug67081_1.xml @@ -4,4 +4,3 @@ <!ELEMENT b EMPTY> ]> <a></a> - diff --git a/ext/dom/tests/bug67081_2.xml b/ext/dom/tests/bug67081_2.xml index c10af0966c..baa9870212 100644 --- a/ext/dom/tests/bug67081_2.xml +++ b/ext/dom/tests/bug67081_2.xml @@ -2,4 +2,3 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <a></a> - diff --git a/ext/dom/tests/dom.xml b/ext/dom/tests/dom.xml index 09ac674e55..c7bbc55413 100644 --- a/ext/dom/tests/dom.xml +++ b/ext/dom/tests/dom.xml @@ -5,4 +5,4 @@ ]> <root> <foo bar="" /> -</root>
\ No newline at end of file +</root> diff --git a/ext/dom/tests/nsdoc.xml b/ext/dom/tests/nsdoc.xml index 9503fd8c5b..9153729d1a 100644 --- a/ext/dom/tests/nsdoc.xml +++ b/ext/dom/tests/nsdoc.xml @@ -1,4 +1,4 @@ <?xml version="1.0"?> <root xmlns="http://ns" xmlns:ns2="http://ns2"> <ns2:child /> -</root>
\ No newline at end of file +</root> diff --git a/ext/dom/tests/skipif.inc b/ext/dom/tests/skipif.inc index 08fd695d97..16ab73febb 100644 --- a/ext/dom/tests/skipif.inc +++ b/ext/dom/tests/skipif.inc @@ -1 +1 @@ -<?php if (!extension_loaded('dom')) die('skip dom extension not available');?>
\ No newline at end of file +<?php if (!extension_loaded('dom')) die('skip dom extension not available');?> diff --git a/ext/enchant/php_enchant.h b/ext/enchant/php_enchant.h index 449fae2d0d..a12ea8ddfa 100644 --- a/ext/enchant/php_enchant.h +++ b/ext/enchant/php_enchant.h @@ -77,4 +77,3 @@ PHP_FUNCTION(enchant_dict_quick_check); * indent-tabs-mode: t * End: */ - diff --git a/ext/exif/config.w32 b/ext/exif/config.w32 index 6ba816793b..0fe93cdb56 100644 --- a/ext/exif/config.w32 +++ b/ext/exif/config.w32 @@ -10,4 +10,4 @@ if(PHP_EXIF != 'no') EXTENSION('exif', 'exif.c', null, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); } -}
\ No newline at end of file +} diff --git a/ext/fileinfo/Makefile.frag b/ext/fileinfo/Makefile.frag index 5af690a9b4..ba84e9a9f5 100644 --- a/ext/fileinfo/Makefile.frag +++ b/ext/fileinfo/Makefile.frag @@ -1,2 +1 @@ - $(builddir)/libmagic/apprentice.lo: $(srcdir)/data_file.c diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c index 2ea1bc4d0c..8ca3c30b40 100644 --- a/ext/gd/gd_compat.c +++ b/ext/gd/gd_compat.c @@ -58,4 +58,3 @@ int overflow2(int a, int b) } return 0; } - diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 13b068a90c..a9634d025e 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -1505,4 +1505,3 @@ ZEND_GET_MODULE(hash) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 index 9161ca91ad..3714ea2ed6 100644 --- a/ext/iconv/config.w32 +++ b/ext/iconv/config.w32 @@ -24,4 +24,3 @@ if (PHP_ICONV != "no") { PHP_ICONV = "no"; } } - diff --git a/ext/iconv/tests/test.inc b/ext/iconv/tests/test.inc index 78f180462f..68d2a3e10c 100644 --- a/ext/iconv/tests/test.inc +++ b/ext/iconv/tests/test.inc @@ -4,4 +4,4 @@ // $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so"; // @dl("iconv$dlext"); //} -?>
\ No newline at end of file +?> diff --git a/ext/imap/tests/README b/ext/imap/tests/README index 0e554e94c0..99424b3995 100644 --- a/ext/imap/tests/README +++ b/ext/imap/tests/README @@ -1,4 +1,3 @@ - Many of the tests in this directory require a mail server to be running, if there is no mail server the test will skip and warn, see skipif.inc for details. To make the tests run parameters in the skipif.inc and imap_include.inc file will need to be changed to match the local mailserver configuration. @@ -39,7 +38,3 @@ auth default { user = root } - - - - diff --git a/ext/imap/tests/clean.inc b/ext/imap/tests/clean.inc index 2557489ba1..4f381bf893 100644 --- a/ext/imap/tests/clean.inc +++ b/ext/imap/tests/clean.inc @@ -22,4 +22,4 @@ foreach($mailboxes as $value) { } imap_close($imap_stream, CL_EXPUNGE); -?>
\ No newline at end of file +?> diff --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp index f8ea2ad39b..b3e8a30f68 100644 --- a/ext/intl/common/common_date.cpp +++ b/ext/intl/common/common_date.cpp @@ -237,4 +237,3 @@ U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func) return rv; } - diff --git a/ext/intl/common/common_date.h b/ext/intl/common/common_date.h index a1c08e434e..acb8e68e9a 100644 --- a/ext/intl/common/common_date.h +++ b/ext/intl/common/common_date.h @@ -39,4 +39,3 @@ U_CFUNC int intl_datetime_decompose(zval *z, double *millis, TimeZone **tz, U_CFUNC double intl_zval_to_millis(zval *z, intl_error *err, const char *func); #endif /* COMMON_DATE_H */ - diff --git a/ext/intl/dateformat/dateformat_attrcpp.cpp b/ext/intl/dateformat/dateformat_attrcpp.cpp index 858cbf5d4d..fec8eb1a67 100644 --- a/ext/intl/dateformat/dateformat_attrcpp.cpp +++ b/ext/intl/dateformat/dateformat_attrcpp.cpp @@ -245,4 +245,3 @@ U_CFUNC PHP_FUNCTION(datefmt_set_calendar) RETURN_TRUE; } /* }}} */ - diff --git a/ext/intl/dateformat/dateformat_attrcpp.h b/ext/intl/dateformat/dateformat_attrcpp.h index c8e4e5b702..ab69914540 100644 --- a/ext/intl/dateformat/dateformat_attrcpp.h +++ b/ext/intl/dateformat/dateformat_attrcpp.h @@ -30,4 +30,3 @@ PHP_FUNCTION(datefmt_set_calendar); PHP_FUNCTION(datefmt_get_calendar_object); #endif /* DATEFORMAT_ATTRCPP_H */ - diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c index 2d1e78b512..5e51796cad 100644 --- a/ext/intl/dateformat/dateformat_format.c +++ b/ext/intl/dateformat/dateformat_format.c @@ -188,4 +188,3 @@ PHP_FUNCTION(datefmt_format) } /* }}} */ - diff --git a/ext/intl/dateformat/dateformat_helpers.h b/ext/intl/dateformat/dateformat_helpers.h index fd73e81d89..7489effc18 100644 --- a/ext/intl/dateformat/dateformat_helpers.h +++ b/ext/intl/dateformat/dateformat_helpers.h @@ -41,4 +41,3 @@ int datefmt_process_calendar_arg(zval* calendar_zv, bool& calendar_owned); #endif /* DATEFORMAT_HELPERS_H */ - diff --git a/ext/intl/dateformat/dateformat_parse.c b/ext/intl/dateformat/dateformat_parse.c index 5f0c497e44..a04ef1105e 100644 --- a/ext/intl/dateformat/dateformat_parse.c +++ b/ext/intl/dateformat/dateformat_parse.c @@ -210,4 +210,3 @@ PHP_FUNCTION(datefmt_localtime) } } /* }}} */ - diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c index 1f6d373b4b..32a9e26006 100644 --- a/ext/intl/grapheme/grapheme_string.c +++ b/ext/intl/grapheme/grapheme_string.c @@ -909,4 +909,3 @@ PHP_FUNCTION(grapheme_extract) * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index 36b225a06c..2e47b17933 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -406,4 +406,3 @@ UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *stat * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/intl/tests/resourcebundle.build b/ext/intl/tests/resourcebundle.build index 560dc8fb45..273e4407b7 100644 --- a/ext/intl/tests/resourcebundle.build +++ b/ext/intl/tests/resourcebundle.build @@ -30,4 +30,4 @@ file_put_contents("$here/_files/res_index.txt", $res_index); passthru( ICU_DIR."genrb -s $here/_files/ -d $here/_files/resourcebundle res_index.txt"); -// passthru(ICU_DIR."icupkg -tl -a $here/rb.txt -s $here/_files -d $here/_files new $here/_files/resourcebundle.dat");
\ No newline at end of file +// passthru(ICU_DIR."icupkg -tl -a $here/rb.txt -s $here/_files -d $here/_files new $here/_files/resourcebundle.dat"); diff --git a/ext/intl/tests/resourcebundle.inc b/ext/intl/tests/resourcebundle.inc index 2ec138bb7d..a7727a3ec8 100644 --- a/ext/intl/tests/resourcebundle.inc +++ b/ext/intl/tests/resourcebundle.inc @@ -10,4 +10,3 @@ function debug( $res ) { } return $ret . sprintf( "%5d: %s\n", intl_get_error_code(), intl_get_error_message() ); } - diff --git a/ext/intl/uchar/uchar.c b/ext/intl/uchar/uchar.c index b7558fd95c..857b4d5d93 100644 --- a/ext/intl/uchar/uchar.c +++ b/ext/intl/uchar/uchar.c @@ -777,4 +777,3 @@ int php_uchar_minit(INIT_FUNC_ARGS) { return SUCCESS; } - diff --git a/ext/json/Makefile.frag.w32 b/ext/json/Makefile.frag.w32 index ceaf2595cb..1463eda70b 100644 --- a/ext/json/Makefile.frag.w32 +++ b/ext/json/Makefile.frag.w32 @@ -1,4 +1,3 @@ - ext\json\json_scanner.c: ext\json\json_scanner.re $(RE2C) $(RE2C_FLAGS) -t ext/json/php_json_scanner_defs.h --no-generation-date -bci -o ext/json/json_scanner.c ext/json/json_scanner.re diff --git a/ext/json/config.w32 b/ext/json/config.w32 index b82b29e764..82e470f2ee 100644 --- a/ext/json/config.w32 +++ b/ext/json/config.w32 @@ -20,4 +20,3 @@ if (PHP_JSON != "no") { PHP_INSTALL_HEADERS("ext/json/", "php_json.h php_json_parser.h php_json_scanner.h"); } - diff --git a/ext/json/json_scanner.re b/ext/json/json_scanner.re index 3fda1df5ad..cf45b90ea0 100644 --- a/ext/json/json_scanner.re +++ b/ext/json/json_scanner.re @@ -393,4 +393,3 @@ std: */ } - diff --git a/ext/json/php_json_parser.h b/ext/json/php_json_parser.h index 5378e50104..d8af613878 100644 --- a/ext/json/php_json_parser.h +++ b/ext/json/php_json_parser.h @@ -84,4 +84,3 @@ PHP_JSON_API int php_json_parse(php_json_parser *parser); int php_json_yyparse(php_json_parser *parser); #endif /* PHP_JSON_PARSER_H */ - diff --git a/ext/json/php_json_scanner.h b/ext/json/php_json_scanner.h index b707e230eb..4fd5f217fd 100644 --- a/ext/json/php_json_scanner.h +++ b/ext/json/php_json_scanner.h @@ -46,4 +46,3 @@ void php_json_scanner_init(php_json_scanner *scanner, char *str, size_t str_len, int php_json_scan(php_json_scanner *s); #endif /* PHP_JSON_SCANNER_H */ - diff --git a/ext/ldap/config.w32 b/ext/ldap/config.w32 index 936c37c3d4..a16a4fcd65 100644 --- a/ext/ldap/config.w32 +++ b/ext/ldap/config.w32 @@ -31,4 +31,3 @@ if (PHP_LDAP != "no") { WARNING("ldap not enabled; libraries and headers not found"); } } - diff --git a/ext/mbstring/libmbfl/DISCLAIMER b/ext/mbstring/libmbfl/DISCLAIMER index 97fe77c33c..21b7a91d55 100644 --- a/ext/mbstring/libmbfl/DISCLAIMER +++ b/ext/mbstring/libmbfl/DISCLAIMER @@ -66,4 +66,3 @@ 1999/4/26 sgk 入力フィルタを実装。漢字コードを推定しながらフィルタを追加。 1999/6/?? Unicodeサポート。 1999/6/22 sgk ライセンスをLGPLに変更。 - diff --git a/ext/mbstring/libmbfl/NEWS b/ext/mbstring/libmbfl/NEWS index 82a763b695..75ea1c5117 100644 --- a/ext/mbstring/libmbfl/NEWS +++ b/ext/mbstring/libmbfl/NEWS @@ -1,4 +1,3 @@ - version 1.3.2 August 20, 2011 - added JISX-0213:2004 based encoding : Shift_JIS-2004, EUC-JP-2004, ISO-2022-JP-2004 (rui). diff --git a/ext/mbstring/libmbfl/filters/emoji2uni.h b/ext/mbstring/libmbfl/filters/emoji2uni.h index adce0b75d4..198b2354d3 100644 --- a/ext/mbstring/libmbfl/filters/emoji2uni.h +++ b/ext/mbstring/libmbfl/filters/emoji2uni.h @@ -1224,4 +1224,3 @@ static const unsigned short mb_tbl_uni_sb2code5_val[] = { // 0xfe4c5 - 0xfee7d 0x285F, 0x2860, 0x2861, }; static const unsigned short mb_tbl_uni_sb2code5_len = sizeof(mb_tbl_uni_sb2code5_key)/sizeof(unsigned short); - diff --git a/ext/mbstring/libmbfl/filters/html_entities.h b/ext/mbstring/libmbfl/filters/html_entities.h index 6833fd8105..be2cf90443 100644 --- a/ext/mbstring/libmbfl/filters/html_entities.h +++ b/ext/mbstring/libmbfl/filters/html_entities.h @@ -38,4 +38,3 @@ typedef struct _mbfl_html_entity_entry { extern const mbfl_html_entity_entry mbfl_html_entity_list[]; #endif /* MBFL_HTML_ENTITIES_H */ - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c index 382c87437c..0a4169a2d8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c @@ -80,5 +80,3 @@ int mbfl_filt_conv_any_7bit(int c, mbfl_convert_filter *filter) } return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ascii.h b/ext/mbstring/libmbfl/filters/mbfilter_ascii.h index 99b4815387..3c8aead9ef 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ascii.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_ascii.h @@ -42,5 +42,3 @@ int mbfl_filt_conv_ascii_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_ascii(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_ASCII_H */ - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_base64.c b/ext/mbstring/libmbfl/filters/mbfilter_base64.c index 661e1a4a5b..f79a3eb8e9 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_base64.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_base64.c @@ -212,5 +212,3 @@ int mbfl_filt_conv_base64dec_flush(mbfl_convert_filter *filter) } return 0; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_big5.c b/ext/mbstring/libmbfl/filters/mbfilter_big5.c index 6b845f2bf9..c2cb9a1005 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_big5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_big5.c @@ -351,5 +351,3 @@ static int mbfl_filt_ident_big5(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c index 9be0fb9ae8..572b9fab84 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte2.c @@ -137,5 +137,3 @@ int mbfl_filt_conv_wchar_byte2le(int c, mbfl_convert_filter *filter) CK((*filter->output_function)((c >> 8) & 0xff, filter->data)); return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c index 46ca04bb71..ed09bb3fde 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_byte4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_byte4.c @@ -159,5 +159,3 @@ int mbfl_filt_conv_wchar_byte4le(int c, mbfl_convert_filter *filter) CK((*filter->output_function)((c >> 24) & 0xff, filter->data)); return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c index e28da316e1..13a2b222ed 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.c @@ -150,5 +150,3 @@ static int mbfl_filt_ident_cp1251(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h index becae48c19..b76cc9f680 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h @@ -41,4 +41,3 @@ int mbfl_filt_conv_wchar_cp1251(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_cp1251_wchar(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_CP1251_H */ - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c index 6479023428..7c628da2f3 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1252.c @@ -145,5 +145,3 @@ static int mbfl_filt_ident_cp1252(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c index b01b19fb06..ae63aed6e1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp1254.c @@ -155,5 +155,3 @@ static int mbfl_filt_ident_cp1254(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c index 81b655d55f..c6012ff682 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c @@ -1301,6 +1301,3 @@ retry: return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c index 057d6c6f91..8b931ba6d0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c @@ -343,5 +343,3 @@ static int mbfl_filt_ident_cp51932(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c index 25ec247c78..9f47664fbe 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp850.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp850.c @@ -145,5 +145,3 @@ static int mbfl_filt_ident_cp850(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c index 95b681243b..c4668dcd57 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp866.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp866.c @@ -149,5 +149,3 @@ static int mbfl_filt_ident_cp866(int c, mbfl_identify_filter *filter) filter->flag = 1; /* not it */ return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c index e6cbd5fc43..d4936d9dcd 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_cp932.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_cp932.c @@ -348,5 +348,3 @@ static int mbfl_filt_ident_cp932(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c index 7fd3d7c315..08be6f3298 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c @@ -242,5 +242,3 @@ static int mbfl_filt_ident_euccn(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c index ba794934b0..1d98873976 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c @@ -328,6 +328,3 @@ int mbfl_filt_ident_eucjp(int c, mbfl_identify_filter *filter) return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c index 2fe24e0f57..f8ae8fc6f7 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c @@ -77,4 +77,3 @@ const struct mbfl_convert_vtbl vtbl_wchar_eucjp2004 = { mbfl_filt_conv_wchar_jis2004, mbfl_filt_conv_jis2004_flush }; - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c index 912ae73504..20e0651554 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c @@ -432,5 +432,3 @@ static int mbfl_filt_ident_eucjp_win(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c index bc780c99ee..9b28556dee 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c @@ -326,4 +326,3 @@ static int mbfl_filt_ident_euctw(int c, mbfl_identify_filter *filter) return c; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c index b7687b6c31..6369542e2e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c @@ -471,5 +471,3 @@ static int mbfl_filt_ident_gb18030(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c index c1fe9f1222..cc0e3653f2 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c @@ -357,5 +357,3 @@ retry: return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c index 17355bf87b..9077d5708b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c @@ -166,5 +166,3 @@ retry: return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c index 239d74e381..9279fe8713 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.c @@ -98,5 +98,3 @@ int mbfl_filt_conv_wchar_8859_1(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c index 0fb6bc88cb..f6c6297151 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.c @@ -136,5 +136,3 @@ int mbfl_filt_conv_wchar_8859_10(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c index 2b2494baa5..fc039892e0 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.c @@ -136,5 +136,3 @@ int mbfl_filt_conv_wchar_8859_13(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c index eb008b8f04..db16cd6a7b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.c @@ -136,5 +136,3 @@ int mbfl_filt_conv_wchar_8859_14(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c index ec1b2bc172..dcc05a00d1 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.c @@ -137,5 +137,3 @@ int mbfl_filt_conv_wchar_8859_2(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c index f3905ac46e..61fbde6f4c 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.c @@ -137,5 +137,3 @@ int mbfl_filt_conv_wchar_8859_3(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c index 19e105a6b8..f5a8aa7307 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.c @@ -135,5 +135,3 @@ int mbfl_filt_conv_wchar_8859_4(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c index ac3b2d2089..629caa1081 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.c @@ -137,5 +137,3 @@ int mbfl_filt_conv_wchar_8859_5(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c index c5bbdd7eec..d3f5f559f2 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.c @@ -137,5 +137,3 @@ int mbfl_filt_conv_wchar_8859_6(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c index 98ffade2e7..a11d1f57ff 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.c @@ -137,5 +137,3 @@ int mbfl_filt_conv_wchar_8859_7(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c index 3d65ce630a..fb4020a4ad 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.c @@ -136,4 +136,3 @@ int mbfl_filt_conv_wchar_8859_8(int c, mbfl_convert_filter *filter) return c; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c index 8a730ae43e..1e368ba5b6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.c @@ -136,5 +136,3 @@ int mbfl_filt_conv_wchar_8859_9(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_jis.c b/ext/mbstring/libmbfl/filters/mbfilter_jis.c index 88395cb09e..8985456d72 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_jis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_jis.c @@ -663,5 +663,3 @@ retry: return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c index b72724f4f1..0d10ea49f8 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_qprint.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_qprint.c @@ -241,6 +241,3 @@ int mbfl_filt_conv_qprintdec_flush(mbfl_convert_filter *filter) return 0; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c index 33b1e1f6fe..5dab2bcbb6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis.c @@ -297,4 +297,3 @@ int mbfl_filt_ident_sjis(int c, mbfl_identify_filter *filter) return c; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c index ff08cf3dae..a1cfa72521 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c @@ -699,4 +699,3 @@ mbfl_filt_conv_sjis_mac_flush(mbfl_convert_filter *filter) return 0; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c index c7acf21409..3dd2e213c6 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c @@ -1,4 +1,3 @@ - /* * "streamable kanji code filter and converter" * Copyright (c) 1998-2002 HappySize, Inc. All rights reserved. @@ -930,4 +929,3 @@ mbfl_filt_conv_sjis_mobile_flush(mbfl_convert_filter *filter) return 0; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c index 17e78793d8..fcf2953108 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.c @@ -348,5 +348,3 @@ static int mbfl_filt_ident_sjis_open(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c index 637e69074c..b99c658e4d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.c @@ -299,4 +299,3 @@ const struct mbfl_convert_vtbl vtbl_tl_jisx0201_jisx0208 = { mbfl_filt_tl_jisx0201_jisx0208, mbfl_filt_tl_jisx0201_jisx0208_flush }; - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c index 08cbf6ddb1..76886695dd 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c @@ -239,6 +239,3 @@ int mbfl_filt_conv_wchar_ucs2le(int c, mbfl_convert_filter *filter) return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c index 011c93fcda..0b85a6f339 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c @@ -277,5 +277,3 @@ int mbfl_filt_conv_wchar_ucs4le(int c, mbfl_convert_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c index 1603793e6a..1c1db5f42a 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uhc.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uhc.c @@ -265,5 +265,3 @@ static int mbfl_filt_ident_uhc(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c index a4864cd3ac..8772d8d5be 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf16.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf16.c @@ -317,6 +317,3 @@ int mbfl_filt_conv_wchar_utf16le(int c, mbfl_convert_filter *filter) return c; } - - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf32.h b/ext/mbstring/libmbfl/filters/mbfilter_utf32.h index aa0883fff4..14b9fa4823 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf32.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf32.h @@ -47,4 +47,3 @@ int mbfl_filt_conv_utf32le_wchar(int c, mbfl_convert_filter *filter); int mbfl_filt_conv_wchar_utf32le(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_UTF32_H */ - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c index f31da86b6c..5c13e45b8e 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7.c @@ -463,5 +463,3 @@ static int mbfl_filt_ident_utf7(int c, mbfl_identify_filter *filter) return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c index d95c5dbaa9..c4d2b5c42d 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c @@ -370,5 +370,3 @@ int mbfl_filt_conv_wchar_utf7imap_flush(mbfl_convert_filter *filter) } return 0; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c index 7132d9ccd6..060cd90860 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c @@ -346,4 +346,3 @@ int mbfl_filt_conv_wchar_utf8_mobile(int c, mbfl_convert_filter *filter) return c; } - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c index 5464fac433..590ecda997 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c @@ -150,5 +150,3 @@ int mbfl_filt_conv_uudec(int c, mbfl_convert_filter * filter) } return c; } - - diff --git a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h index c02d21f878..9d4bd5fd6b 100644 --- a/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h +++ b/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h @@ -36,4 +36,3 @@ extern const struct mbfl_convert_vtbl vtbl_uuencode_8bit; int mbfl_filt_conv_uudec(int c, mbfl_convert_filter *filter); #endif /* MBFL_MBFILTER_UUENCODE_H */ - diff --git a/ext/mbstring/libmbfl/filters/sjis_mac2uni.h b/ext/mbstring/libmbfl/filters/sjis_mac2uni.h index 7853d96ba4..c50caba29d 100644 --- a/ext/mbstring/libmbfl/filters/sjis_mac2uni.h +++ b/ext/mbstring/libmbfl/filters/sjis_mac2uni.h @@ -1,5 +1,3 @@ - - static const unsigned short sjis_mac2wchar1[] = { // 0x03ac - 0x03c9 0x339c, 0x339f, 0x339d, 0x33a0, 0x33a4, 0xff4d, 0x33a1, 0x33a5, diff --git a/ext/mbstring/libmbfl/filters/unicode_prop.h b/ext/mbstring/libmbfl/filters/unicode_prop.h index bbb92b98e7..6eaefbc2e3 100644 --- a/ext/mbstring/libmbfl/filters/unicode_prop.h +++ b/ext/mbstring/libmbfl/filters/unicode_prop.h @@ -164,4 +164,3 @@ static const unsigned char mbfl_charprop_table[] = { /* ~ 126 */ MBFL_CHP_MMHQENC , /* DEL 127 */ MBFL_CHP_MMHQENC }; - diff --git a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h index 327e2a1278..01afcc1f2d 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h @@ -5064,4 +5064,3 @@ static const unsigned short *uni2jis_tbl[] = { static const int uni2jis_tbl_len = sizeof(uni2jis_tbl_range)/(sizeof(int)*2); #endif /* UNICODE_TABLE_JIS2004_H */ - diff --git a/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h b/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h index 2674e0c9b8..e59c685fe8 100644 --- a/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h +++ b/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h @@ -163,4 +163,3 @@ static const int koi8u_ucs_table_max = 0x80 + (sizeof (koi8u_ucs_table) / sizeof #endif /* UNNICODE_TABLE_KOI8U_H */ - diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c index 24392e0776..343a968794 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c +++ b/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c @@ -62,4 +62,3 @@ int mbfl_filt_conv_pass(int c, mbfl_convert_filter *filter) { return (*filter->output_function)(c, filter->data); } - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c index 86636f69c5..da563cc7d6 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_allocators.c @@ -79,4 +79,3 @@ static void __mbfl__free(void *ptr) { free(ptr); } - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c index c201bd93c6..e13838f4ca 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_convert.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_convert.c @@ -496,5 +496,3 @@ void mbfl_filt_conv_common_dtor(mbfl_convert_filter *filter) filter->status = 0; filter->cache = 0; } - - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_language.c b/ext/mbstring/libmbfl/mbfl/mbfl_language.c index 0d5e6a2471..bbc07f0bda 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_language.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_language.c @@ -159,4 +159,3 @@ mbfl_no_language2name(enum mbfl_no_language no_language) return language->name; } } - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h index 985e251158..d85a10fb28 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h +++ b/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h @@ -74,4 +74,3 @@ MBFLAPI extern void mbfl_wchar_device_clear(mbfl_wchar_device *device); #endif /* MBFL_MEMORY_DEVICE_H */ - diff --git a/ext/mbstring/libmbfl/mbfl/mbfl_string.c b/ext/mbstring/libmbfl/mbfl/mbfl_string.c index b0f86e958a..b1acecb259 100644 --- a/ext/mbstring/libmbfl/mbfl/mbfl_string.c +++ b/ext/mbstring/libmbfl/mbfl/mbfl_string.c @@ -74,5 +74,3 @@ mbfl_string_clear(mbfl_string *string) string->len = 0; } } - - diff --git a/ext/mbstring/libmbfl/nls/nls_de.c b/ext/mbstring/libmbfl/nls/nls_de.c index 7fb7a26f26..729f71840f 100644 --- a/ext/mbstring/libmbfl/nls/nls_de.c +++ b/ext/mbstring/libmbfl/nls/nls_de.c @@ -18,4 +18,3 @@ const mbfl_language mbfl_language_german = { mbfl_no_encoding_qprint, mbfl_no_encoding_8bit }; - diff --git a/ext/mbstring/libmbfl/nls/nls_en.c b/ext/mbstring/libmbfl/nls/nls_en.c index 46a647af2f..15522eb575 100644 --- a/ext/mbstring/libmbfl/nls/nls_en.c +++ b/ext/mbstring/libmbfl/nls/nls_en.c @@ -16,4 +16,3 @@ const mbfl_language mbfl_language_english = { mbfl_no_encoding_qprint, mbfl_no_encoding_8bit }; - diff --git a/ext/mbstring/libmbfl/nls/nls_kr.c b/ext/mbstring/libmbfl/nls/nls_kr.c index 3b1a7add3f..a8373b3eab 100644 --- a/ext/mbstring/libmbfl/nls/nls_kr.c +++ b/ext/mbstring/libmbfl/nls/nls_kr.c @@ -16,4 +16,3 @@ const mbfl_language mbfl_language_korean = { mbfl_no_encoding_base64, mbfl_no_encoding_7bit }; - diff --git a/ext/mbstring/libmbfl/nls/nls_neutral.c b/ext/mbstring/libmbfl/nls/nls_neutral.c index 8abd3e91a4..58eed2a5c2 100644 --- a/ext/mbstring/libmbfl/nls/nls_neutral.c +++ b/ext/mbstring/libmbfl/nls/nls_neutral.c @@ -16,4 +16,3 @@ const mbfl_language mbfl_language_neutral = { mbfl_no_encoding_base64, mbfl_no_encoding_base64 }; - diff --git a/ext/mbstring/libmbfl/nls/nls_tr.c b/ext/mbstring/libmbfl/nls/nls_tr.c index 1d17bd29f7..f1a9950e5c 100644 --- a/ext/mbstring/libmbfl/nls/nls_tr.c +++ b/ext/mbstring/libmbfl/nls/nls_tr.c @@ -16,4 +16,3 @@ const mbfl_language mbfl_language_turkish = { mbfl_no_encoding_qprint, mbfl_no_encoding_8bit }; - diff --git a/ext/mbstring/libmbfl/nls/nls_uni.c b/ext/mbstring/libmbfl/nls/nls_uni.c index d4fb42c291..cd061d185c 100644 --- a/ext/mbstring/libmbfl/nls/nls_uni.c +++ b/ext/mbstring/libmbfl/nls/nls_uni.c @@ -18,4 +18,3 @@ const mbfl_language mbfl_language_uni = { mbfl_no_encoding_base64, mbfl_no_encoding_base64 }; - diff --git a/ext/mbstring/libmbfl/nls/nls_zh.c b/ext/mbstring/libmbfl/nls/nls_zh.c index 2de90153b0..45a59e468d 100644 --- a/ext/mbstring/libmbfl/nls/nls_zh.c +++ b/ext/mbstring/libmbfl/nls/nls_zh.c @@ -26,4 +26,3 @@ const mbfl_language mbfl_language_traditional_chinese = { mbfl_no_encoding_base64, mbfl_no_encoding_8bit }; - diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index a4c97b2335..08b6e2b0a5 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -397,4 +397,3 @@ SAPI_POST_HANDLER_FUNC(php_mb_post_handler) * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h index 20fbb38a50..5ada93fcc5 100644 --- a/ext/mbstring/php_mbregex.h +++ b/ext/mbstring/php_mbregex.h @@ -104,4 +104,3 @@ PHP_FUNCTION(mb_regex_set_options); * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/mbstring/php_unicode.h b/ext/mbstring/php_unicode.h index 68dff61da4..10c3a7d46d 100644 --- a/ext/mbstring/php_unicode.h +++ b/ext/mbstring/php_unicode.h @@ -197,6 +197,3 @@ static inline int php_unicode_is_upper(unsigned long code) { #endif /* PHP_UNICODE_H */ - - - diff --git a/ext/mbstring/ucgendat/OPENLDAP_LICENSE b/ext/mbstring/ucgendat/OPENLDAP_LICENSE index 6295703c0a..05ad7571e4 100644 --- a/ext/mbstring/ucgendat/OPENLDAP_LICENSE +++ b/ext/mbstring/ucgendat/OPENLDAP_LICENSE @@ -44,4 +44,4 @@ OpenLDAP is a registered trademark of the OpenLDAP Foundation. Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, California, USA. All Rights Reserved. Permission to copy and -distribute verbatim copies of this document is granted.
\ No newline at end of file +distribute verbatim copies of this document is granted. diff --git a/ext/mbstring/ucgendat/README b/ext/mbstring/ucgendat/README index b5af1b8319..39fd7b2f6b 100644 --- a/ext/mbstring/ucgendat/README +++ b/ext/mbstring/ucgendat/README @@ -4,6 +4,3 @@ It's only necessary to rebuild unicode_data.h from Unicode ucd files. Example usage: php ucgendat.php UnicodeData.txt - - - diff --git a/ext/mysqli/mysqli_fe.h b/ext/mysqli/mysqli_fe.h index dab9b18861..9dc038355f 100644 --- a/ext/mysqli/mysqli_fe.h +++ b/ext/mysqli/mysqli_fe.h @@ -137,4 +137,3 @@ PHP_FUNCTION(mysqli_driver_construct); PHP_METHOD(mysqli_warning,__construct); #endif /* MYSQLI_FE_H */ - diff --git a/ext/mysqli/mysqli_libmysql.h b/ext/mysqli/mysqli_libmysql.h index 6759d8a1c2..a4ba66e15b 100644 --- a/ext/mysqli/mysqli_libmysql.h +++ b/ext/mysqli/mysqli_libmysql.h @@ -127,4 +127,3 @@ #endif #endif /* MYSQLI_LIBMYSQL_H */ - diff --git a/ext/mysqli/tests/clean_table.inc b/ext/mysqli/tests/clean_table.inc index 716cc84416..86e5fcb379 100644 --- a/ext/mysqli/tests/clean_table.inc +++ b/ext/mysqli/tests/clean_table.inc @@ -11,4 +11,4 @@ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { } mysqli_close($link); -?>
\ No newline at end of file +?> diff --git a/ext/mysqli/tests/reflection_tools.inc b/ext/mysqli/tests/reflection_tools.inc index c8338bfa24..6648526ed0 100644 --- a/ext/mysqli/tests/reflection_tools.inc +++ b/ext/mysqli/tests/reflection_tools.inc @@ -118,4 +118,4 @@ // printf("getDefaultValue: %s\n", ($param->getDefaultValue()) ? 'yes' : 'no'); } -?>
\ No newline at end of file +?> diff --git a/ext/mysqli/tests/skipif.inc b/ext/mysqli/tests/skipif.inc index a7581fb480..5562aab84b 100644 --- a/ext/mysqli/tests/skipif.inc +++ b/ext/mysqli/tests/skipif.inc @@ -2,4 +2,4 @@ if (!extension_loaded('mysqli')){ die('skip mysqli extension not available'); } -?>
\ No newline at end of file +?> diff --git a/ext/mysqli/tests/skipifemb.inc b/ext/mysqli/tests/skipifemb.inc index 254a4ccece..ad143a42a4 100644 --- a/ext/mysqli/tests/skipifemb.inc +++ b/ext/mysqli/tests/skipifemb.inc @@ -2,4 +2,4 @@ $driver = new mysqli_driver(); if ($driver->embedded) die("skip test doesn't run with embedded server"); -?>
\ No newline at end of file +?> diff --git a/ext/mysqli/tests/skipifnotemb.inc b/ext/mysqli/tests/skipifnotemb.inc index d73d185bc4..fa5fb9f0a3 100644 --- a/ext/mysqli/tests/skipifnotemb.inc +++ b/ext/mysqli/tests/skipifnotemb.inc @@ -2,4 +2,4 @@ $driver = new mysqli_driver(); if (!$driver->embedded) die("skip test for with embedded server only"); -?>
\ No newline at end of file +?> diff --git a/ext/odbc/tests/config.inc b/ext/odbc/tests/config.inc index dcc4cbb3bf..d9da63d0b7 100644 --- a/ext/odbc/tests/config.inc +++ b/ext/odbc/tests/config.inc @@ -16,4 +16,3 @@ if (false === $user) { if (false == $pass) { $pass = ''; } - diff --git a/ext/opcache/config.w32 b/ext/opcache/config.w32 index 14cb7ca593..1d78f7e548 100644 --- a/ext/opcache/config.w32 +++ b/ext/opcache/config.w32 @@ -29,4 +29,3 @@ if (PHP_OPCACHE != "no") { ADD_FLAG('CFLAGS_OPCACHE', "/I " + configure_module_dirname); } - diff --git a/ext/opcache/tests/php_cli_server.inc b/ext/opcache/tests/php_cli_server.inc index ca781b7cd7..70ef14e585 100644 --- a/ext/opcache/tests/php_cli_server.inc +++ b/ext/opcache/tests/php_cli_server.inc @@ -73,4 +73,3 @@ function php_cli_server_start($ini = "") { } ?> - diff --git a/ext/openssl/config.w32 b/ext/openssl/config.w32 index bd1f2d1589..6e5a4e549d 100644 --- a/ext/openssl/config.w32 +++ b/ext/openssl/config.w32 @@ -21,5 +21,3 @@ if (PHP_OPENSSL != "no") { } } } - - diff --git a/ext/pcntl/README b/ext/pcntl/README index 34313b2040..ab1dfa1f2d 100644 --- a/ext/pcntl/README +++ b/ext/pcntl/README @@ -9,8 +9,3 @@ this functionality. Thanks, Jason Greeme < jason@inetgurus.net / jason@php.net > - - - - - diff --git a/ext/pcre/config.w32 b/ext/pcre/config.w32 index b0b1e0ce7c..2aef554e0d 100644 --- a/ext/pcre/config.w32 +++ b/ext/pcre/config.w32 @@ -17,4 +17,3 @@ ARG_WITH("pcre-jit", "Enable PCRE JIT support", "yes"); if (PHP_PCRE_JIT != "no") { AC_DEFINE('HAVE_PCRE_JIT_SUPPORT', 1, 'PCRE library'); } - diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 3f7f04d4fc..753071340d 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -116,4 +116,3 @@ PHP_ARG_WITH(pcre-valgrind,,[ --with-pcre-valgrind=DIR fi fi fi - diff --git a/ext/pcre/php_pcre.def b/ext/pcre/php_pcre.def index aa229d5c3d..30b528e4ea 100644 --- a/ext/pcre/php_pcre.def +++ b/ext/pcre/php_pcre.def @@ -67,4 +67,3 @@ php_pcre2_substring_nametable_scan php_pcre2_substring_number_from_name php_pcre2_set_recursion_limit php_pcre2_set_recursion_memory_management - diff --git a/ext/pdo/CREDITS b/ext/pdo/CREDITS index 5971cdb0dd..a9899d230f 100644 --- a/ext/pdo/CREDITS +++ b/ext/pdo/CREDITS @@ -1,3 +1,2 @@ PHP Data Objects Wez Furlong, Marcus Boerger, Sterling Hughes, George Schlossnagle, Ilia Alshanetsky - diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag index 698699be75..8d6c57095b 100644 --- a/ext/pdo/Makefile.frag +++ b/ext/pdo/Makefile.frag @@ -33,4 +33,3 @@ install-pdo-headers: # mini hack install: $(all_targets) $(install_targets) install-pdo-headers - diff --git a/ext/pdo/Makefile.frag.w32 b/ext/pdo/Makefile.frag.w32 index 3958f95a9f..b4f2ec9f8c 100644 --- a/ext/pdo/Makefile.frag.w32 +++ b/ext/pdo/Makefile.frag.w32 @@ -1,5 +1,3 @@ - ext\pdo\pdo_sql_parser.c: ext\pdo\pdo_sql_parser.re cd $(PHP_SRC_DIR) $(RE2C) $(RE2C_FLAGS) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re - diff --git a/ext/pdo/README b/ext/pdo/README index 2b833714ae..cb7b4297d4 100644 --- a/ext/pdo/README +++ b/ext/pdo/README @@ -50,5 +50,3 @@ responsibility to call commit() when you are done making changes and autocommit is turned off. vim:tw=78:et - - diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4 index a42b6a3a88..91c977a7a9 100644 --- a/ext/pdo/config.m4 +++ b/ext/pdo/config.m4 @@ -51,4 +51,3 @@ if test "$PHP_PDO" != "no"; then dnl so we always include the known-good working hack. PHP_ADD_MAKEFILE_FRAGMENT fi - diff --git a/ext/pdo/pdo_sqlstate.c b/ext/pdo/pdo_sqlstate.c index 6723e0d034..36ea9d494c 100644 --- a/ext/pdo/pdo_sqlstate.c +++ b/ext/pdo/pdo_sqlstate.c @@ -331,4 +331,3 @@ const char *pdo_sqlstate_state_to_description(char *state) } return NULL; } - diff --git a/ext/pdo_dblib/config.w32 b/ext/pdo_dblib/config.w32 index 5ff4d7b80b..9ceed49205 100644 --- a/ext/pdo_dblib/config.w32 +++ b/ext/pdo_dblib/config.w32 @@ -38,4 +38,3 @@ if (PHP_PDO_MSSQL != "no") { WARNING("pdo_mssql not enabled, libraries or headers not found") } } - diff --git a/ext/pdo_mysql/CREDITS b/ext/pdo_mysql/CREDITS index 0423cccd64..eb11169bd9 100644 --- a/ext/pdo_mysql/CREDITS +++ b/ext/pdo_mysql/CREDITS @@ -1,3 +1,2 @@ MySQL driver for PDO George Schlossnagle, Wez Furlong, Ilia Alshanetsky, Johannes Schlueter - diff --git a/ext/pdo_mysql/tests/table.inc b/ext/pdo_mysql/tests/table.inc index c7bb9cc5ee..54bf14f07d 100644 --- a/ext/pdo_mysql/tests/table.inc +++ b/ext/pdo_mysql/tests/table.inc @@ -6,4 +6,4 @@ if (!$db) { // $db->exec('DROP TABLE IF EXISTS test'); $db->exec('CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine); $db->exec('INSERT INTO test(id, label) VALUES (1, "a"), (2, "b"), (3, "c"), (4, "d"), (5, "e"), (6, "f")'); -?>
\ No newline at end of file +?> diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 75f133cdb4..ea85fc1556 100644 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -234,4 +234,3 @@ if test "$PHP_PDO_OCI" != "no"; then AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ]) fi - diff --git a/ext/pdo_odbc/config.w32 b/ext/pdo_odbc/config.w32 index ea511a55df..6a94da7f79 100644 --- a/ext/pdo_odbc/config.w32 +++ b/ext/pdo_odbc/config.w32 @@ -15,5 +15,3 @@ if (PHP_PDO_ODBC != "no") { PHP_PDO_ODBC = "no" } } - - diff --git a/ext/pdo_sqlite/php_pdo_sqlite.h b/ext/pdo_sqlite/php_pdo_sqlite.h index 1af7ba870e..6e5f26bf2c 100644 --- a/ext/pdo_sqlite/php_pdo_sqlite.h +++ b/ext/pdo_sqlite/php_pdo_sqlite.h @@ -52,4 +52,3 @@ ZEND_END_MODULE_GLOBALS(pdo_sqlite) #endif #endif /* PHP_PDO_SQLITE_H */ - diff --git a/ext/pgsql/README b/ext/pgsql/README index 26f7aad02d..11f112dfc0 100644 --- a/ext/pgsql/README +++ b/ext/pgsql/README @@ -232,4 +232,3 @@ bool pg_ping(resource db) Again, experimental functions are subject to be changed without notice. - diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index 953678a376..44860ee993 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -105,5 +105,3 @@ if test "$PHP_PGSQL" != "no"; then PHP_NEW_EXTENSION(pgsql, pgsql.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) fi - - diff --git a/ext/pgsql/tests/nonblocking.inc b/ext/pgsql/tests/nonblocking.inc index 4cf7c09a51..c121c62413 100644 --- a/ext/pgsql/tests/nonblocking.inc +++ b/ext/pgsql/tests/nonblocking.inc @@ -35,4 +35,3 @@ function nb_consume($db, $db_socket) { } }; - diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag index e1dda15723..b27a1017e9 100644 --- a/ext/phar/Makefile.frag +++ b/ext/phar/Makefile.frag @@ -48,4 +48,3 @@ install-pharcmd: pharcmd @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1 @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1 - diff --git a/ext/phar/Makefile.frag.w32 b/ext/phar/Makefile.frag.w32 index 29906a3723..4b36116902 100644 --- a/ext/phar/Makefile.frag.w32 +++ b/ext/phar/Makefile.frag.w32 @@ -1,5 +1,3 @@ - ext\phar\phar_path_check.c: ext\phar\phar_path_check.re cd $(PHP_SRC_DIR) $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re - diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c index eb6dff8d27..87020c5ed8 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -1164,4 +1164,3 @@ void phar_restore_orig_functions(void) /* {{{ */ * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/phar/gdbhelp b/ext/phar/gdbhelp index 14ff89c56b..bd4150e3ef 100644 --- a/ext/phar/gdbhelp +++ b/ext/phar/gdbhelp @@ -119,4 +119,4 @@ document dump_entry dump_entry "pharname"|"pharalias" "filename" [1] display phar_entry_info for a file within a phar. If the optional third param is passed in, displays the php_stream that is the file's fp -end
\ No newline at end of file +end diff --git a/ext/phar/phar/directorygraphiterator.inc b/ext/phar/phar/directorygraphiterator.inc index 5a658ddabc..34579678a7 100644 --- a/ext/phar/phar/directorygraphiterator.inc +++ b/ext/phar/phar/directorygraphiterator.inc @@ -31,4 +31,4 @@ class DirectoryGraphIterator extends DirectoryTreeIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/phar/directorytreeiterator.inc b/ext/phar/phar/directorytreeiterator.inc index 9ed2e1a1bf..2c681632fb 100644 --- a/ext/phar/phar/directorytreeiterator.inc +++ b/ext/phar/phar/directorytreeiterator.inc @@ -51,4 +51,4 @@ class DirectoryTreeIterator extends RecursiveIteratorIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/phar/invertedregexiterator.inc b/ext/phar/phar/invertedregexiterator.inc index aec87e6ab1..8f82f41f2a 100644 --- a/ext/phar/phar/invertedregexiterator.inc +++ b/ext/phar/phar/invertedregexiterator.inc @@ -24,4 +24,4 @@ class InvertedRegexIterator extends RegexIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/phar/phar.inc b/ext/phar/phar/phar.inc index c28de0aa7a..129a0c43bf 100644 --- a/ext/phar/phar/phar.inc +++ b/ext/phar/phar/phar.inc @@ -77,4 +77,4 @@ class Phar extends PHP_Archive implements RecursiveIterator } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/phar/phar.php b/ext/phar/phar/phar.php index f6f26c23f2..13538777a5 100755 --- a/ext/phar/phar/phar.php +++ b/ext/phar/phar/phar.php @@ -53,4 +53,4 @@ new PharCommand($argc, $argv); __HALT_COMPILER(); -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc b/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc index 0bfef46853..df74c13880 100644 --- a/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc +++ b/ext/phar/tests/cache_list/files/frontcontroller13.phar.inc @@ -11,4 +11,4 @@ $a['oof/hi.php'] = '<?php var_dump("hi");'; $a->setStub('<?php Phar::webPhar(); -__HALT_COMPILER();');
\ No newline at end of file +__HALT_COMPILER();'); diff --git a/ext/phar/tests/cache_list/files/nophar.phar.inc b/ext/phar/tests/cache_list/files/nophar.phar.inc index 36d5628762..35b0ddc5e2 100644 --- a/ext/phar/tests/cache_list/files/nophar.phar.inc +++ b/ext/phar/tests/cache_list/files/nophar.phar.inc @@ -7,4 +7,4 @@ $p['web.php'] = '<?php echo "web\n";'; $p['b/c.php'] = '<?php echo "in b\n";$a = fopen("index.php", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";'; $p['d'] = "in d\n"; $p->setStub($p->createDefaultStub('index.php', 'web.php')); -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/cache_list/files/phar_oo_test.inc b/ext/phar/tests/cache_list/files/phar_oo_test.inc index 9863e8da93..0691e4dc80 100644 --- a/ext/phar/tests/cache_list/files/phar_oo_test.inc +++ b/ext/phar/tests/cache_list/files/phar_oo_test.inc @@ -46,4 +46,4 @@ EOF; $ftime = mktime(12, 0, 0, 3, 1, 2006); include 'phar_test.inc'; -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/cache_list/files/phar_test.inc b/ext/phar/tests/cache_list/files/phar_test.inc index 047f4ea051..5f0031f560 100644 --- a/ext/phar/tests/cache_list/files/phar_test.inc +++ b/ext/phar/tests/cache_list/files/phar_test.inc @@ -73,4 +73,4 @@ if (@$bz2) { fclose($fp); } -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/files/frontcontroller13.phar.inc b/ext/phar/tests/files/frontcontroller13.phar.inc index 0bfef46853..df74c13880 100644 --- a/ext/phar/tests/files/frontcontroller13.phar.inc +++ b/ext/phar/tests/files/frontcontroller13.phar.inc @@ -11,4 +11,4 @@ $a['oof/hi.php'] = '<?php var_dump("hi");'; $a->setStub('<?php Phar::webPhar(); -__HALT_COMPILER();');
\ No newline at end of file +__HALT_COMPILER();'); diff --git a/ext/phar/tests/files/nophar.phar.inc b/ext/phar/tests/files/nophar.phar.inc index 36d5628762..35b0ddc5e2 100644 --- a/ext/phar/tests/files/nophar.phar.inc +++ b/ext/phar/tests/files/nophar.phar.inc @@ -7,4 +7,4 @@ $p['web.php'] = '<?php echo "web\n";'; $p['b/c.php'] = '<?php echo "in b\n";$a = fopen("index.php", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";'; $p['d'] = "in d\n"; $p->setStub($p->createDefaultStub('index.php', 'web.php')); -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/files/phar_oo_test.inc b/ext/phar/tests/files/phar_oo_test.inc index 45421568de..3883d494c1 100644 --- a/ext/phar/tests/files/phar_oo_test.inc +++ b/ext/phar/tests/files/phar_oo_test.inc @@ -47,4 +47,4 @@ EOF; $ftime = mktime(12, 0, 0, 3, 1, 2006); include 'phar_test.inc'; -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/files/stuboflength1041.phar.inc b/ext/phar/tests/files/stuboflength1041.phar.inc index 28ce8427f3..9d51a750df 100644 --- a/ext/phar/tests/files/stuboflength1041.phar.inc +++ b/ext/phar/tests/files/stuboflength1041.phar.inc @@ -18,4 +18,4 @@ $phar->setStub('<?php ************************************************************************************************ ************************************************************************************************ *********************************************/ -__HALT_COMPILER();');
\ No newline at end of file +__HALT_COMPILER();'); diff --git a/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc b/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc index b5222f5805..4e30dca174 100644 --- a/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc +++ b/ext/phar/tests/tar/files/corrupt_tarmaker.php.inc @@ -174,4 +174,4 @@ class corrupt_tarmaker fwrite($this->tmp, pack('a1024', '')); fclose($this->tmp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc index 52f5a23507..641dda56f5 100644 --- a/ext/phar/tests/tar/files/make.dangerous.tar.php.inc +++ b/ext/phar/tests/tar/files/make.dangerous.tar.php.inc @@ -167,4 +167,4 @@ class danger_tarmaker fwrite($this->tmp, pack('a1024', '')); fclose($this->tmp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/tar/files/make_invalid_tar.php.inc b/ext/phar/tests/tar/files/make_invalid_tar.php.inc index 413dd7bd1b..895977bf2f 100644 --- a/ext/phar/tests/tar/files/make_invalid_tar.php.inc +++ b/ext/phar/tests/tar/files/make_invalid_tar.php.inc @@ -6,4 +6,4 @@ function close() fwrite($this->tmp, (binary)'oopsie'); fclose($this->tmp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/tar/files/tarmaker.php.inc b/ext/phar/tests/tar/files/tarmaker.php.inc index 0df7ee9933..5860bf84d3 100644 --- a/ext/phar/tests/tar/files/tarmaker.php.inc +++ b/ext/phar/tests/tar/files/tarmaker.php.inc @@ -166,4 +166,4 @@ class tarmaker fwrite($this->tmp, pack('a1024', '')); fclose($this->tmp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc index ddac6a4ade..80c6a3eab6 100644 --- a/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc +++ b/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc @@ -328,4 +328,4 @@ class corrupt_zipmaker file_put_contents($zipfile, $write); } } -?>
\ No newline at end of file +?> diff --git a/ext/phar/tests/zip/files/make_invalid_tar.php.inc b/ext/phar/tests/zip/files/make_invalid_tar.php.inc index cec8ef7793..4f4758bbb6 100644 --- a/ext/phar/tests/zip/files/make_invalid_tar.php.inc +++ b/ext/phar/tests/zip/files/make_invalid_tar.php.inc @@ -9,4 +9,4 @@ function close() fwrite($fp, 'oopsie'); fclose($fp); } -}
\ No newline at end of file +} diff --git a/ext/phar/tests/zip/files/zipmaker.php.inc b/ext/phar/tests/zip/files/zipmaker.php.inc index ad16fda659..c9eebad7ed 100644 --- a/ext/phar/tests/zip/files/zipmaker.php.inc +++ b/ext/phar/tests/zip/files/zipmaker.php.inc @@ -67,4 +67,4 @@ class zipmaker { $this->zip->close(); } -}
\ No newline at end of file +} diff --git a/ext/pspell/README b/ext/pspell/README index 58806289db..9fc884c65b 100644 --- a/ext/pspell/README +++ b/ext/pspell/README @@ -48,4 +48,4 @@ pspell_add_to_personal() to add words to the wordlist and finally pspell_save_wordlist() to save it. Note that at this moment pspell_save_wordlist() will return TRUE, even if -there was an error. This will be changed once pspell library is fixed.
\ No newline at end of file +there was an error. This will be changed once pspell library is fixed. diff --git a/ext/pspell/config.w32 b/ext/pspell/config.w32 index 8ea7fe763c..d88ea1d30c 100644 --- a/ext/pspell/config.w32 +++ b/ext/pspell/config.w32 @@ -12,4 +12,3 @@ if (PHP_PSPELL != "no") { WARNING("pspell not enabled; libraries and headers not found"); } } - diff --git a/ext/readline/config.w32 b/ext/readline/config.w32 index 1a524e1535..4e9e89c964 100644 --- a/ext/readline/config.w32 +++ b/ext/readline/config.w32 @@ -12,4 +12,3 @@ if (PHP_READLINE != "no") { WARNING("readline not enabled; libraries and headers not found"); } } - diff --git a/ext/readline/php_readline.h b/ext/readline/php_readline.h index eebd50b6e4..8d7e5511b1 100644 --- a/ext/readline/php_readline.h +++ b/ext/readline/php_readline.h @@ -39,4 +39,3 @@ extern zend_module_entry readline_module_entry; #endif /* HAVE_LIBREADLINE */ #endif /* PHP_READLINE_H */ - diff --git a/ext/readline/readline_cli.h b/ext/readline/readline_cli.h index 69bf12c3a3..0448a8f3c8 100644 --- a/ext/readline/readline_cli.h +++ b/ext/readline/readline_cli.h @@ -37,5 +37,3 @@ extern PHP_MSHUTDOWN_FUNCTION(cli_readline); extern PHP_MINFO_FUNCTION(cli_readline); ZEND_EXTERN_MODULE_GLOBALS(cli_readline) - - diff --git a/ext/reflection/tests/included4.inc b/ext/reflection/tests/included4.inc index 88947251cd..313fc5feca 100644 --- a/ext/reflection/tests/included4.inc +++ b/ext/reflection/tests/included4.inc @@ -6,4 +6,4 @@ function g() { echo __FILE__ . "\n"; echo __LINE__ . "\n"; } -?>
\ No newline at end of file +?> diff --git a/ext/session/tests/save_handler.inc b/ext/session/tests/save_handler.inc index 15ad29029f..56b3505284 100644 --- a/ext/session/tests/save_handler.inc +++ b/ext/session/tests/save_handler.inc @@ -192,4 +192,3 @@ function feature() { } ?> - diff --git a/ext/simplexml/tests/000.xml b/ext/simplexml/tests/000.xml index b0f2785463..86a22ba0fa 100644 --- a/ext/simplexml/tests/000.xml +++ b/ext/simplexml/tests/000.xml @@ -13,4 +13,4 @@ </elem2>Here is some more</elem1> <elem1 attr1='11' attr2='12'/> <elem11><elem111><elem1111/></elem111></elem11> -</sxe>
\ No newline at end of file +</sxe> diff --git a/ext/simplexml/tests/bug24392.xml b/ext/simplexml/tests/bug24392.xml index d669f1df41..2cb5106eea 100644 --- a/ext/simplexml/tests/bug24392.xml +++ b/ext/simplexml/tests/bug24392.xml @@ -73,4 +73,4 @@ xmlns="http://my.netscape.com/rdf/simple/0.9/"> <link>http://slashdot.org/search.pl</link> </textinput> -</rdf:RDF>
\ No newline at end of file +</rdf:RDF> diff --git a/ext/simplexml/tests/sxe.xml b/ext/simplexml/tests/sxe.xml index 413be72087..0a730ae809 100644 --- a/ext/simplexml/tests/sxe.xml +++ b/ext/simplexml/tests/sxe.xml @@ -14,4 +14,4 @@ </elem3> </elem2> </elem1> -</sxe>
\ No newline at end of file +</sxe> diff --git a/ext/simplexml/tests/sxe私はガラスを食べられます.xml b/ext/simplexml/tests/sxe私はガラスを食べられます.xml index 413be72087..0a730ae809 100644 --- a/ext/simplexml/tests/sxe私はガラスを食べられます.xml +++ b/ext/simplexml/tests/sxe私はガラスを食べられます.xml @@ -14,4 +14,4 @@ </elem3> </elem2> </elem1> -</sxe>
\ No newline at end of file +</sxe> diff --git a/ext/skeleton/config.w32.in b/ext/skeleton/config.w32.in index 4159262496..ea5064b7e2 100644 --- a/ext/skeleton/config.w32.in +++ b/ext/skeleton/config.w32.in @@ -4,4 +4,4 @@ if (PHP_%EXTNAMECAPS% != 'no') { AC_DEFINE('HAVE_%EXTNAMECAPS%', 1, '%EXTNAME% support enabled'); EXTENSION('%EXTNAME%', '%EXTNAME%.c', null, '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); -}
\ No newline at end of file +} diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h index 542bc91548..35e094d661 100644 --- a/ext/skeleton/php_skeleton.h +++ b/ext/skeleton/php_skeleton.h @@ -13,4 +13,4 @@ ZEND_TSRMLS_CACHE_EXTERN() # endif #endif /* PHP_%EXTNAMECAPS%_H */ -%FOOTER%
\ No newline at end of file +%FOOTER% diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c index 04b07ecf29..a93fd57f53 100644 --- a/ext/skeleton/skeleton.c +++ b/ext/skeleton/skeleton.c @@ -100,4 +100,4 @@ ZEND_TSRMLS_CACHE_DEFINE() # endif ZEND_GET_MODULE(%EXTNAME%) #endif -%FOOTER%
\ No newline at end of file +%FOOTER% diff --git a/ext/snmp/config.w32 b/ext/snmp/config.w32 index 449c762543..33c6ca2a70 100644 --- a/ext/snmp/config.w32 +++ b/ext/snmp/config.w32 @@ -16,4 +16,3 @@ if (PHP_SNMP != "no") { WARNING("snmp not enabled; libraries and headers not found"); } } - diff --git a/ext/snmp/tests/skipif.inc b/ext/snmp/tests/skipif.inc index 72423251fd..d8ee31d0c4 100644 --- a/ext/snmp/tests/skipif.inc +++ b/ext/snmp/tests/skipif.inc @@ -10,4 +10,3 @@ require_once (dirname(__FILE__).'/snmp_include.inc'); if (snmpget($hostname, $community, '.1.3.6.1.2.1.1.1.0', $timeout) === false) die('NO SNMPD on this host or community invalid'); - diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index 1c04a90568..2f0fd60f89 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -3660,4 +3660,3 @@ static void delete_document(zval *zv) xmlDocPtr doc = Z_PTR_P(zv); xmlFreeDoc(doc); } - diff --git a/ext/soap/tests/interop/Round2/Base/round2_base.inc b/ext/soap/tests/interop/Round2/Base/round2_base.inc index 48eaf40f89..b5d6ced74c 100644 --- a/ext/soap/tests/interop/Round2/Base/round2_base.inc +++ b/ext/soap/tests/interop/Round2/Base/round2_base.inc @@ -78,4 +78,4 @@ ini_set("soap.wsdl_cache_enabled",0); $server = new SoapServer(dirname(__FILE__)."/round2_base.wsdl"); $server->setClass("SOAP_Interop_Base"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc index a9da5653e3..727def1ee6 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclit.inc @@ -25,4 +25,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_doclit.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc index b65da2782c..8ecf366824 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_doclitparams.inc @@ -26,4 +26,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_doclitparams.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc index ee38a12136..0b97f8bac9 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_emptysa.inc @@ -11,4 +11,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_emptysa.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc index ecde53e155..8981c0e6ba 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import1.inc @@ -11,4 +11,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_import1.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc index 5957c374a1..3eea780899 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import2.inc @@ -11,4 +11,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_import2.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc index 3a3df9791b..c96dcbb643 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_import3.inc @@ -16,4 +16,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_import3.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc index e88df3312b..8b4804db14 100644 --- a/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc +++ b/ext/soap/tests/interop/Round3/GroupD/round3_groupD_rpcenc.inc @@ -25,4 +25,4 @@ class SOAP_Interop_GroupD { $server = new SoapServer(dirname(__FILE__)."/round3_groupD_rpcenc.wsdl"); $server->setClass("SOAP_Interop_GroupD"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc b/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc index 19a769c001..7b918c0afb 100644 --- a/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc +++ b/ext/soap/tests/interop/Round3/GroupE/round3_groupE_list.inc @@ -14,4 +14,4 @@ $server = new SoapServer(dirname(__FILE__)."/round3_groupE_list.wsdl"); $server->setClass("SOAP_Interop_GroupE"); $server->handle($HTTP_RAW_POST_DATA); var_dump($d); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc index e90586efdb..d2af69e4be 100644 --- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc +++ b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_ext.inc @@ -11,4 +11,4 @@ class SOAP_Interop_GroupF { $server = new SoapServer(dirname(__FILE__)."/round3_groupF_ext.wsdl"); $server->setClass("SOAP_Interop_GroupF"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc index b7e67b0f52..0940d1c399 100644 --- a/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc +++ b/ext/soap/tests/interop/Round3/GroupF/round3_groupF_headers.inc @@ -19,4 +19,4 @@ class SOAP_Interop_GroupF { $server = new SoapServer(dirname(__FILE__)."/round3_groupF_ext.wsdl"); $server->setClass("SOAP_Interop_GroupF"); $server->handle($HTTP_RAW_POST_DATA); -?>
\ No newline at end of file +?> diff --git a/ext/sockets/config.w32 b/ext/sockets/config.w32 index 6a1a2907ed..aeb419c4f0 100644 --- a/ext/sockets/config.w32 +++ b/ext/sockets/config.w32 @@ -13,4 +13,3 @@ if (PHP_SOCKETS != "no") { WARNING("sockets not enabled; libraries and headers not found"); } } - diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index 6c843d733d..d0e51815da 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -124,4 +124,3 @@ php_socket *socket_import_file_descriptor(PHP_SOCKET sock); * c-basic-offset: 4 * End: */ - diff --git a/ext/sodium/README.md b/ext/sodium/README.md index 104570a241..64b575956b 100644 --- a/ext/sodium/README.md +++ b/ext/sodium/README.md @@ -10,4 +10,3 @@ Full documentation here: [Using Libsodium in PHP Projects](https://paragonie.com/book/pecl-libsodium), a guide to using the libsodium PHP extension for modern, secure, and fast cryptography. - diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c index 5751cf97cd..4c170dd8d4 100644 --- a/ext/spl/spl_heap.c +++ b/ext/spl/spl_heap.c @@ -1245,4 +1245,3 @@ PHP_MINIT_FUNCTION(spl_heap) /* {{{ */ * vim600: fdm=marker * vim: noet sw=4 ts=4 */ - diff --git a/ext/spl/tests/testclass.class.inc b/ext/spl/tests/testclass.class.inc index f5fe7411fa..c5d6034423 100644 --- a/ext/spl/tests/testclass.class.inc +++ b/ext/spl/tests/testclass.class.inc @@ -6,4 +6,4 @@ class TestClass { } -?>
\ No newline at end of file +?> diff --git a/ext/spl/tests/testclass.inc b/ext/spl/tests/testclass.inc index ceb24c877c..0684d2098d 100644 --- a/ext/spl/tests/testclass.inc +++ b/ext/spl/tests/testclass.inc @@ -2,4 +2,4 @@ echo __FILE__ . "\n"; -?>
\ No newline at end of file +?> diff --git a/ext/spl/tests/testclass.php.inc b/ext/spl/tests/testclass.php.inc index ceb24c877c..0684d2098d 100644 --- a/ext/spl/tests/testclass.php.inc +++ b/ext/spl/tests/testclass.php.inc @@ -2,4 +2,4 @@ echo __FILE__ . "\n"; -?>
\ No newline at end of file +?> diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag index 2cc75ca93f..16d8a20285 100644 --- a/ext/standard/Makefile.frag +++ b/ext/standard/Makefile.frag @@ -1,4 +1,3 @@ - $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) diff --git a/ext/standard/Makefile.frag.w32 b/ext/standard/Makefile.frag.w32 index 15ad0789fd..7815c7c97d 100644 --- a/ext/standard/Makefile.frag.w32 +++ b/ext/standard/Makefile.frag.w32 @@ -1,4 +1,3 @@ - ext\standard\var_unserializer.c: ext\standard\var_unserializer.re cd $(PHP_SRC_DIR) $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re @@ -8,4 +7,3 @@ ext\standard\url_scanner_ex.c: ext\standard\url_scanner_ex.re $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re $(BUILD_DIR)\ext\standard\basic_functions.obj: $(PHP_SRC_DIR)\Zend\zend_language_parser.h - diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 893e2219ad..005fda4b56 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -387,4 +387,3 @@ PHP_FUNCTION(assert_options) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/cyr_convert.h b/ext/standard/cyr_convert.h index c3127d2f87..a3b7b93cf3 100644 --- a/ext/standard/cyr_convert.h +++ b/ext/standard/cyr_convert.h @@ -22,6 +22,3 @@ PHP_FUNCTION(convert_cyr_string); #endif /* CYR_CONVERT_H */ - - - diff --git a/ext/standard/file.h b/ext/standard/file.h index 9edd5bef6c..b4e564f1c3 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -142,4 +142,3 @@ extern PHPAPI php_file_globals file_globals; #endif /* FILE_H */ - diff --git a/ext/standard/hrtime.c b/ext/standard/hrtime.c index eea60f5d23..04b237e075 100644 --- a/ext/standard/hrtime.c +++ b/ext/standard/hrtime.c @@ -201,4 +201,3 @@ PHPAPI php_hrtime_t php_hrtime_current(void) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/html_tables/ents_html401.txt b/ext/standard/html_tables/ents_html401.txt index bd3ded9fde..c0533b0134 100644 --- a/ext/standard/html_tables/ents_html401.txt +++ b/ext/standard/html_tables/ents_html401.txt @@ -250,4 +250,4 @@ Dagger 2021 permil 2030 lsaquo 2039 rsaquo 203A -euro 20AC
\ No newline at end of file +euro 20AC diff --git a/ext/standard/html_tables/ents_html5.txt b/ext/standard/html_tables/ents_html5.txt index 005bebbe20..18fcc02f9c 100644 --- a/ext/standard/html_tables/ents_html5.txt +++ b/ext/standard/html_tables/ents_html5.txt @@ -2122,4 +2122,4 @@ zigrarr 021DD zopf 1D56B zscr 1D4CF zwj 0200D -zwnj 0200C
\ No newline at end of file +zwnj 0200C diff --git a/ext/standard/html_tables/ents_xhtml.txt b/ext/standard/html_tables/ents_xhtml.txt index 81800bcd2d..90cebfd274 100644 --- a/ext/standard/html_tables/ents_xhtml.txt +++ b/ext/standard/html_tables/ents_xhtml.txt @@ -250,4 +250,4 @@ loz 25CA spades 2660 clubs 2663 hearts 2665 -diams 2666
\ No newline at end of file +diams 2666 diff --git a/ext/standard/http.c b/ext/standard/http.c index aec0e60d89..18788cc3a6 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -264,4 +264,3 @@ PHP_FUNCTION(http_build_query) * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/info.h b/ext/standard/info.h index a810c97083..5b458bf846 100644 --- a/ext/standard/info.h +++ b/ext/standard/info.h @@ -83,4 +83,3 @@ void register_phpinfo_constants(INIT_FUNC_ARGS); END_EXTERN_C() #endif /* INFO_H */ - diff --git a/ext/standard/mt_rand.c b/ext/standard/mt_rand.c index 814f602855..bf945b181f 100644 --- a/ext/standard/mt_rand.c +++ b/ext/standard/mt_rand.c @@ -367,4 +367,3 @@ PHP_MINIT_FUNCTION(mt_rand) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/standard/php_crypt_r.c b/ext/standard/php_crypt_r.c index d680393efb..7af5636c08 100644 --- a/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c @@ -424,4 +424,3 @@ char * php_md5_crypt_r(const char *pw, const char *salt, char *out) #undef MD5_MAGIC #undef MD5_MAGIC_LEN #endif - diff --git a/ext/standard/php_http.h b/ext/standard/php_http.h index c1cc093433..f5d91ce61b 100644 --- a/ext/standard/php_http.h +++ b/ext/standard/php_http.h @@ -41,4 +41,3 @@ PHP_FUNCTION(http_build_query); * vim600: sw=4 ts=4 fdm=marker * vim<600: sw=4 ts=4 */ - diff --git a/ext/standard/php_mt_rand.h b/ext/standard/php_mt_rand.h index 6dcfbdbaa5..04d8842638 100644 --- a/ext/standard/php_mt_rand.h +++ b/ext/standard/php_mt_rand.h @@ -40,4 +40,3 @@ PHPAPI zend_long php_mt_rand_common(zend_long min, zend_long max); PHP_MINIT_FUNCTION(mt_rand); #endif /* PHP_MT_RAND_H */ - diff --git a/ext/standard/php_smart_string.h b/ext/standard/php_smart_string.h index 0d6a135159..63f8d9ec60 100644 --- a/ext/standard/php_smart_string.h +++ b/ext/standard/php_smart_string.h @@ -19,4 +19,3 @@ /* Header moved to Zend. This file is retained for BC. */ #include "zend_smart_string.h" - diff --git a/ext/standard/php_smart_string_public.h b/ext/standard/php_smart_string_public.h index 255fbd94a1..272b948515 100644 --- a/ext/standard/php_smart_string_public.h +++ b/ext/standard/php_smart_string_public.h @@ -19,4 +19,3 @@ /* Header moved to Zend. This file is retained for BC. */ #include "zend_smart_string_public.h" - diff --git a/ext/standard/proc_open.h b/ext/standard/proc_open.h index 5963007567..f3f8961673 100644 --- a/ext/standard/proc_open.h +++ b/ext/standard/proc_open.h @@ -46,4 +46,3 @@ struct php_process_handle { int is_persistent; php_process_env_t env; }; - diff --git a/ext/standard/streamsfuncs.h b/ext/standard/streamsfuncs.h index bbcd18f815..ef43220335 100644 --- a/ext/standard/streamsfuncs.h +++ b/ext/standard/streamsfuncs.h @@ -76,4 +76,3 @@ PHP_FUNCTION(stream_socket_pair); * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - diff --git a/ext/standard/tests/array/compare_function.inc b/ext/standard/tests/array/compare_function.inc index e5176802ab..4fa672e767 100644 --- a/ext/standard/tests/array/compare_function.inc +++ b/ext/standard/tests/array/compare_function.inc @@ -10,4 +10,4 @@ function compare_function($var1, $var2) { } } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/class_object/AutoInterface.inc b/ext/standard/tests/class_object/AutoInterface.inc index f1e5b1f58f..805d7f1f6f 100644 --- a/ext/standard/tests/class_object/AutoInterface.inc +++ b/ext/standard/tests/class_object/AutoInterface.inc @@ -2,4 +2,4 @@ Interface AutoInterface {} -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/class_object/AutoLoaded.inc b/ext/standard/tests/class_object/AutoLoaded.inc index 52e6671ddc..2935b801e5 100644 --- a/ext/standard/tests/class_object/AutoLoaded.inc +++ b/ext/standard/tests/class_object/AutoLoaded.inc @@ -2,4 +2,4 @@ class AutoLoaded {} -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/class_object/AutoTest.inc b/ext/standard/tests/class_object/AutoTest.inc index a0c8244265..fb487fb071 100644 --- a/ext/standard/tests/class_object/AutoTest.inc +++ b/ext/standard/tests/class_object/AutoTest.inc @@ -10,4 +10,4 @@ class autoTest { } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/class_object/AutoTrait.inc b/ext/standard/tests/class_object/AutoTrait.inc index 698e975ef7..c371d59271 100644 --- a/ext/standard/tests/class_object/AutoTrait.inc +++ b/ext/standard/tests/class_object/AutoTrait.inc @@ -2,4 +2,4 @@ trait AutoTrait {} -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/file/fopen_include_path.inc b/ext/standard/tests/file/fopen_include_path.inc index 5bc9b6ce3b..e33dae4915 100644 --- a/ext/standard/tests/file/fopen_include_path.inc +++ b/ext/standard/tests/file/fopen_include_path.inc @@ -89,4 +89,4 @@ function teardown_relative_path() { rmdir($newdir); } } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/file/windows_mb_path/util.inc b/ext/standard/tests/file/windows_mb_path/util.inc index 98cec87dc6..de4072a1aa 100644 --- a/ext/standard/tests/file/windows_mb_path/util.inc +++ b/ext/standard/tests/file/windows_mb_path/util.inc @@ -146,4 +146,3 @@ function create_data($id, $item = "", $cp = 65001, $utf8 = true) return $prefix; } - diff --git a/ext/standard/tests/file/windows_mb_path/util_utf8.inc b/ext/standard/tests/file/windows_mb_path/util_utf8.inc index 8d7009f91c..e091564998 100644 --- a/ext/standard/tests/file/windows_mb_path/util_utf8.inc +++ b/ext/standard/tests/file/windows_mb_path/util_utf8.inc @@ -92,4 +92,3 @@ echo \"hello there from the include\n\";"; return $prefix; } - diff --git a/ext/standard/tests/filters/filter_errors.inc b/ext/standard/tests/filters/filter_errors.inc index 6d1a270c82..8636fbe17f 100644 --- a/ext/standard/tests/filters/filter_errors.inc +++ b/ext/standard/tests/filters/filter_errors.inc @@ -34,4 +34,3 @@ function filter_errors_test($filter, $data) { stream_get_contents($stream); } - diff --git a/ext/standard/tests/general_functions/proc_open_pipes.inc b/ext/standard/tests/general_functions/proc_open_pipes.inc index 0d9894683a..576118ffd6 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes.inc +++ b/ext/standard/tests/general_functions/proc_open_pipes.inc @@ -19,4 +19,3 @@ function unlink_sleep_script() unlink($fname); } } - diff --git a/ext/standard/tests/ini_info/scandir/0.ini b/ext/standard/tests/ini_info/scandir/0.ini index ecc77af06e..fac6473265 100644 --- a/ext/standard/tests/ini_info/scandir/0.ini +++ b/ext/standard/tests/ini_info/scandir/0.ini @@ -1,4 +1,4 @@ ; This file is named 0.ini so it should be the first line of ; any scanned ini output -date.timezone = Antarctica/McMurdo
\ No newline at end of file +date.timezone = Antarctica/McMurdo diff --git a/ext/standard/tests/math/allowed_rounding_error.inc b/ext/standard/tests/math/allowed_rounding_error.inc index 71dbf9af4a..9ba754b582 100644 --- a/ext/standard/tests/math/allowed_rounding_error.inc +++ b/ext/standard/tests/math/allowed_rounding_error.inc @@ -15,4 +15,4 @@ function allowed_rounding_error ($number, $expected) { return false; } } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/misc/browscap_lite_2016_12_06.ini b/ext/standard/tests/misc/browscap_lite_2016_12_06.ini index 8f91165977..b5a7432e2d 100644 --- a/ext/standard/tests/misc/browscap_lite_2016_12_06.ini +++ b/ext/standard/tests/misc/browscap_lite_2016_12_06.ini @@ -11015,4 +11015,3 @@ Comment="Default Browser" Browser="Default Browser" isMobileDevice="false" isTablet="false" - diff --git a/ext/standard/tests/serialize/autoload_implements.inc b/ext/standard/tests/serialize/autoload_implements.inc index 2c3479c860..55fcc3cd9f 100644 --- a/ext/standard/tests/serialize/autoload_implements.inc +++ b/ext/standard/tests/serialize/autoload_implements.inc @@ -7,4 +7,4 @@ class autoload_implements implements autoload_interface { } } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/serialize/autoload_interface.inc b/ext/standard/tests/serialize/autoload_interface.inc index 6908155e61..e6a416e721 100644 --- a/ext/standard/tests/serialize/autoload_interface.inc +++ b/ext/standard/tests/serialize/autoload_interface.inc @@ -4,4 +4,4 @@ interface autoload_interface { function testFunction(); } -?>
\ No newline at end of file +?> diff --git a/ext/standard/tests/streams/bug64433_srv.inc b/ext/standard/tests/streams/bug64433_srv.inc index e79a2fd6d6..dcdb1bcbaa 100644 --- a/ext/standard/tests/streams/bug64433_srv.inc +++ b/ext/standard/tests/streams/bug64433_srv.inc @@ -11,4 +11,4 @@ if(!empty($_REQUEST["status"])) { http_response_code($_REQUEST["status"]); } -echo "HELLO!\n";
\ No newline at end of file +echo "HELLO!\n"; diff --git a/ext/sysvshm/config.w32 b/ext/sysvshm/config.w32 index 3a9a0d47df..80fb28ee61 100644 --- a/ext/sysvshm/config.w32 +++ b/ext/sysvshm/config.w32 @@ -5,4 +5,4 @@ ARG_ENABLE('sysvshm', 'SysV Shared Memory support', 'no'); if (PHP_SYSVSHM != 'no') { AC_DEFINE('HAVE_SYSVSHM', 1); EXTENSION('sysvshm', 'sysvshm.c'); -}
\ No newline at end of file +} diff --git a/ext/tidy/config.w32 b/ext/tidy/config.w32 index bfb738264e..9b20441a1a 100644 --- a/ext/tidy/config.w32 +++ b/ext/tidy/config.w32 @@ -26,4 +26,3 @@ if (PHP_TIDY != "no") { WARNING("tidy not enabled; libraries and headers not found"); } } - diff --git a/ext/tokenizer/config.w32 b/ext/tokenizer/config.w32 index 41fadc62da..ee98c0cc13 100644 --- a/ext/tokenizer/config.w32 +++ b/ext/tokenizer/config.w32 @@ -6,5 +6,3 @@ if (PHP_TOKENIZER == "yes") { EXTENSION("tokenizer", "tokenizer.c tokenizer_data.c"); AC_DEFINE("HAVE_TOKENIZER", 1, "Tokenizer support"); } - - diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c index 11ee044a59..3ffef8a55d 100644 --- a/ext/tokenizer/tokenizer_data.c +++ b/ext/tokenizer/tokenizer_data.c @@ -304,4 +304,3 @@ char *get_token_type_name(int token_type) } return "UNKNOWN"; } - diff --git a/ext/wddx/config.w32 b/ext/wddx/config.w32 index afa7279220..d5d4e80e5e 100644 --- a/ext/wddx/config.w32 +++ b/ext/wddx/config.w32 @@ -21,5 +21,3 @@ if (PHP_WDDX == "yes" && ADD_EXTENSION_DEP('wddx', 'xml') CHECK_HEADER_ADD_INCLUDE("timelib_config.h", "CFLAGS_WDDX", "ext/date/lib"); } - - diff --git a/ext/xmlreader/config.w32 b/ext/xmlreader/config.w32 index 2c41200fce..b9ab7dbe03 100644 --- a/ext/xmlreader/config.w32 +++ b/ext/xmlreader/config.w32 @@ -15,4 +15,3 @@ if (PHP_XMLREADER == "yes" && ADD_EXTENSION_DEP('xmlreader', 'libxml'); ADD_EXTENSION_DEP('xmlreader', 'dom'); } - diff --git a/ext/xmlreader/tests/XMLReaderBad_bug71805.xml b/ext/xmlreader/tests/XMLReaderBad_bug71805.xml index 68ee25ddb8..0f90a69cf0 100644 --- a/ext/xmlreader/tests/XMLReaderBad_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderBad_bug71805.xml @@ -4,4 +4,4 @@ <record><aaa><bbbb><ccc><![CDATA[XXX Xxxxxxxxxxxx]]></ccc><ddd><![CDATA[XXX Xx]]></ddd></bbbb><eee><![CDATA[Xxxxx xxxxxxx: xxxx://xxx.xxx.xx.xx/xxxx?xxxxXx=0xx000x0-000x-0xx0-x000-x0000xx0xx00 Xxxxxxxxxxxx xx Xxxxxxxxxxxx Xxxxxxxxx xx Xxxxxxxxx Xxxxxxxxxxxx Xxxxxxxxxxx Xxxxxxxxxxxx (XXX Xxxxxxxxxxxx), xxxxxxxxx xxxxxxx xx Xxx Xxxxxxxxxx Xxxxxxxxxx Xxx.]]></eee></aaa><fff><bbbb><ggg><![CDATA[Xxxxxxxxx Xxxxxxxxxxxxxxx Xxxxxxxxxx xx Xxxxxxxxxxxx]]></ggg><ccc><![CDATA[XXX Xxxxxxxxxxxx]]></ccc></bbbb><hhh><![CDATA[Xx xxxxx, xx xxxxxxxxxxx XXX Xxxxxxxxxxxx x xxxxxcé x’xxxxxxxx xxx x’Xxxxxxléx léxxxxxxxxx xx xx xxxxxxxx xx xx Xxxxxxxxxx Xxxxxxxxxx Xxx (xxx xxx xx xxxxxxxxxx xxxxxxxxx). Xxxxx xxx xréxxxx xxx xxxxxx xxx déxxxxxxxx XXX Xxxxxxxxxxxx xx xxxx xx’xxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxréxxxxxxtéx xx xxxxxxx xxx XX, xxx XXX xx xxx XXX xx xx xxxxxxxx xx xxxxx x’xxxxxxxx xx xxxxx xx xxxxxxxxx xxxxxxxxxxxxx xxréé (XXX). (Xxxxxxxxéx XXX - Xxx 0000)]]></hhh></fff></record> -</records>
\ No newline at end of file +</records> diff --git a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml index 9a59e0c978..7d8ef1fad3 100644 --- a/ext/xmlreader/tests/XMLReaderGood_bug71805.xml +++ b/ext/xmlreader/tests/XMLReaderGood_bug71805.xml @@ -4,4 +4,4 @@ <record><aaa><bbbb><ddd><![CDATA[XXX Xx]]></ddd></bbbb><eee><![CDATA[Xxxxx xxxxxxx: xxxx://xxx.xxx.xx.xx/xxxx?xxxxXx=0xx000x0-000x-0xx0-x000-x0000xx0xx00 Xxxxxxxxxxxx xx Xxxxxxxxxxxx Xxxxxxxxx xx Xxxxxxxxx Xxxxxxxxxxxx Xxxxxxxxxxx Xxxxxxxxxxxx (XXX Xxxxxxxxxxxx), xxxxxxxxx xxxxxxx xx Xxx Xxxxxxxxxx Xxxxxxxxxx Xxx.]]></eee></aaa><fff><bbbb><ggg><![CDATA[Xxxxxxxxx Xxxxxxxxxxxxxxx Xxxxxxxxxx xx Xxxxxxxxxxxx]]></ggg><ccc><![CDATA[XXX Xxxxxxxxxxxx]]></ccc></bbbb><hhh><![CDATA[Xx xxxxx, xx xxxxxxxxxxx XXX Xxxxxxxxxxxx x xxxxxcé x’xxxxxxxx xxx x’Xxxxxxléx léxxxxxxxxx xx xx xxxxxxxx xx xx Xxxxxxxxxx Xxxxxxxxxx Xxx (xxx xxx xx xxxxxxxxxx xxxxxxxxx). Xxxxx xxx xréxxxx xxx xxxxxx xxx déxxxxxxxx XXX Xxxxxxxxxxxx xx xxxx xx’xxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxréxxxxxxtéx xx xxxxxxx xxx XX, xxx XXX xx xxx XXX xx xx xxxxxxxx xx xxxxx x’xxxxxxxx xx xxxxx xx xxxxxxxxx xxxxxxxxxxxxx xxréé (XXX). (Xxxxxxxxéx XXX - Xxx 0000)]]></hhh></fff></record> -</records>
\ No newline at end of file +</records> diff --git a/ext/xmlrpc/config.w32 b/ext/xmlrpc/config.w32 index 1d7d57cae4..87f4412a92 100644 --- a/ext/xmlrpc/config.w32 +++ b/ext/xmlrpc/config.w32 @@ -18,4 +18,3 @@ if (PHP_XMLRPC != "no") { PHP_XMLRPC = "no"; } } - diff --git a/ext/xmlrpc/libxmlrpc/README b/ext/xmlrpc/libxmlrpc/README index 323edfa671..4835cd68e9 100644 --- a/ext/xmlrpc/libxmlrpc/README +++ b/ext/xmlrpc/libxmlrpc/README @@ -10,8 +10,3 @@ The rules are: This allows us to have a nicely encapsulated C api with opaque data types and private functions that are nonetheless shared between source files without redundant extern declarations.. - - - - - diff --git a/ext/xmlrpc/libxmlrpc/base64.h b/ext/xmlrpc/libxmlrpc/base64.h index 6a0c8ef6fc..f0272b4356 100644 --- a/ext/xmlrpc/libxmlrpc/base64.h +++ b/ext/xmlrpc/libxmlrpc/base64.h @@ -35,4 +35,3 @@ void _free_real(void *p, char *file, int line); #define malloc(s) _malloc_real(s,__FILE__,__LINE__) #define free(p) _free_real(p, __FILE__,__LINE__) #endif - diff --git a/ext/xmlrpc/libxmlrpc/encodings.c b/ext/xmlrpc/libxmlrpc/encodings.c index 77b5cc15a6..fb75dbb9dc 100644 --- a/ext/xmlrpc/libxmlrpc/encodings.c +++ b/ext/xmlrpc/libxmlrpc/encodings.c @@ -110,4 +110,3 @@ char* utf8_decode(const char *s, int len, int *newlen, const char* encoding) { return convert(s, len, newlen, "UTF-8", encoding); } - diff --git a/ext/xmlrpc/libxmlrpc/system_methods.c b/ext/xmlrpc/libxmlrpc/system_methods.c index ff5e651fd0..31f4156a5d 100644 --- a/ext/xmlrpc/libxmlrpc/system_methods.c +++ b/ext/xmlrpc/libxmlrpc/system_methods.c @@ -370,6 +370,3 @@ XMLRPC_VALUE xsm_system_get_capabilities_cb(XMLRPC_SERVER server, XMLRPC_REQUEST /*-*********************** * End System Methods API * *************************/ - - - diff --git a/ext/xmlrpc/libxmlrpc/system_methods_private.h b/ext/xmlrpc/libxmlrpc/system_methods_private.h index fa3fc279f2..bea8779da9 100644 --- a/ext/xmlrpc/libxmlrpc/system_methods_private.h +++ b/ext/xmlrpc/libxmlrpc/system_methods_private.h @@ -85,7 +85,3 @@ int xsm_is_system_method(XMLRPC_Callback cb); #endif /* __SYSTEM_METHODS_PRIVATE_H */ - - - - diff --git a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c index 63cc52d6b7..0a391b8444 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c @@ -313,4 +313,3 @@ xml_element* DANDARPC_REQUEST_to_xml_element(XMLRPC_REQUEST request) { } return root; } - diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c b/ext/xmlrpc/libxmlrpc/xml_to_soap.c index 64a9a6eaa5..cd0933fcbc 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c @@ -664,4 +664,3 @@ xml_element* SOAP_REQUEST_to_xml_element(XMLRPC_REQUEST request) { return root; } - diff --git a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c index 309f0dce3d..860cba3e36 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c @@ -407,4 +407,3 @@ xml_element* XMLRPC_REQUEST_to_xml_element(XMLRPC_REQUEST request) { } return wrapper; } - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.h b/ext/xmlrpc/libxmlrpc/xmlrpc.h index 12b6c7a8ee..c3b30cbea8 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc.h @@ -450,6 +450,3 @@ const char* XMLRPC_GetVersionString(void); #endif #endif /* not XMLRPC_ALREADY_INCLUDED */ - - - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h index 41a31c6f51..2f90fc0e3c 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection.h @@ -96,6 +96,3 @@ int XMLRPC_ServerRegisterIntrospectionCallback(XMLRPC_SERVER server, XMLRPC_Intr #endif /* __XI_INTROSPECTION_H */ - - - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h index 5b231fe344..1a5d9f79a9 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc_introspection_private.h @@ -100,7 +100,3 @@ void xi_register_system_methods(XMLRPC_SERVER server); #endif /* __XI_INTROSPECTION_PRIVATE_H */ - - - - diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc_private.h b/ext/xmlrpc/libxmlrpc/xmlrpc_private.h index e43f78ecfb..7cda5c24be 100644 --- a/ext/xmlrpc/libxmlrpc/xmlrpc_private.h +++ b/ext/xmlrpc/libxmlrpc/xmlrpc_private.h @@ -175,4 +175,3 @@ const char* type_to_str(XMLRPC_VALUE_TYPE type, XMLRPC_VECTOR_TYPE vtype); #endif /* XMLRPC_PRIVATE_ALREADY_INCLUDED */ - diff --git a/ext/xmlwriter/config.w32 b/ext/xmlwriter/config.w32 index 75c76ead88..1a787917bf 100644 --- a/ext/xmlwriter/config.w32 +++ b/ext/xmlwriter/config.w32 @@ -14,4 +14,3 @@ if (PHP_XMLWRITER == "yes" && PHP_LIBXML == "yes") { WARNING('Could not find xmlwriter.h'); } } - diff --git a/ext/xsl/tests/53965/collection.xml b/ext/xsl/tests/53965/collection.xml index a3039cd101..1c9dc175cd 100644 --- a/ext/xsl/tests/53965/collection.xml +++ b/ext/xsl/tests/53965/collection.xml @@ -10,4 +10,4 @@ <artist>Jimi Hendrix</artist> <year>1997</year> </cd> -</collection>
\ No newline at end of file +</collection> diff --git a/ext/xsl/tests/area_name.xml b/ext/xsl/tests/area_name.xml index 76cea58511..fbe3b20212 100644 --- a/ext/xsl/tests/area_name.xml +++ b/ext/xsl/tests/area_name.xml @@ -7,6 +7,3 @@ <AREA_NAME_ENG>m."Avtovo"</AREA_NAME_ENG> </ROW> </AREA_NAME> - - - diff --git a/ext/xsl/tests/exslt.xml b/ext/xsl/tests/exslt.xml index 562e08e821..06110aabd4 100644 --- a/ext/xsl/tests/exslt.xml +++ b/ext/xsl/tests/exslt.xml @@ -12,4 +12,3 @@ <date date="2006-01-01"/> <date date="2007-12-31"/> </page> - diff --git a/ext/zend_test/config.w32 b/ext/zend_test/config.w32 index 9b1574ef4e..76a0f1ae5b 100644 --- a/ext/zend_test/config.w32 +++ b/ext/zend_test/config.w32 @@ -5,4 +5,3 @@ ARG_ENABLE("zend-test", "enable zend-test extension", "no"); if (PHP_ZEND_TEST != "no") { EXTENSION("zend_test", "test.c", PHP_ZEND_TEST_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); } - diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c index da83a9fa1d..31455daab8 100644 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -274,4 +274,3 @@ ZEND_TSRMLS_CACHE_DEFINE() #endif ZEND_GET_MODULE(zend_test) #endif - diff --git a/ext/zip/examples/addglob.php b/ext/zip/examples/addglob.php index 790312b4d5..3c432f0be5 100644 --- a/ext/zip/examples/addglob.php +++ b/ext/zip/examples/addglob.php @@ -11,4 +11,3 @@ $options = array( $found = $z->addGlob("/home/pierre/cvs/gd/libgd/tests/*.png", 0, $options); var_dump($found); $z->close(); - diff --git a/ext/zip/examples/addpattern.php b/ext/zip/examples/addpattern.php index a1a9b12291..41efaa5eb7 100644 --- a/ext/zip/examples/addpattern.php +++ b/ext/zip/examples/addpattern.php @@ -10,4 +10,3 @@ $options = array('remove_path' => '/home/pierre/cvs/gd/libgd/tests', $found = $z->addPattern("/(\.png)$/i", "/home/pierre/cvs/gd/libgd/tests", $options); var_dump($found); $z->close(); - diff --git a/ext/zip/examples/encryption.php b/ext/zip/examples/encryption.php index 69888170a9..9ef7dd8497 100644 --- a/ext/zip/examples/encryption.php +++ b/ext/zip/examples/encryption.php @@ -46,4 +46,3 @@ $ctx = stream_context_create(array( )); $text = file_get_contents("zip://$name#$file", false, $ctx); printf("Size = %d\n", strlen($text)); - diff --git a/ext/zip/examples/fopen.php b/ext/zip/examples/fopen.php index 32357f3c08..80de5d052a 100644 --- a/ext/zip/examples/fopen.php +++ b/ext/zip/examples/fopen.php @@ -31,5 +31,3 @@ while (!feof($fp)) { fclose($fp); file_put_contents('t',$contents); echo "done.\n"; - - diff --git a/ext/zip/examples/get_set_comments.php b/ext/zip/examples/get_set_comments.php index 5bd302e6da..bec4240246 100644 --- a/ext/zip/examples/get_set_comments.php +++ b/ext/zip/examples/get_set_comments.php @@ -35,4 +35,3 @@ echo $z->getCommentName('foobar/', ZIPARCHIVE::FL_UNCHANGED) . "\n"; echo "Archive comment: " . $z->getArchiveComment() . "\n"; echo "Archive comment (original): " . $z->getArchiveComment(ZIPARCHIVE::FL_UNCHANGED) . "\n"; - diff --git a/ext/zip/examples/im.php b/ext/zip/examples/im.php index e954576ad6..6a35e31242 100644 --- a/ext/zip/examples/im.php +++ b/ext/zip/examples/im.php @@ -8,4 +8,3 @@ $z->open(dirname(__FILE__) . '/test_im.zip'); $im_string = $z->getFromName("pear_item.gif"); $im = imagecreatefromstring($im_string); imagepng($im, 'b.png'); - diff --git a/ext/zip/tests/bug38943.inc b/ext/zip/tests/bug38943.inc index a6f45e8294..b439939e64 100644 --- a/ext/zip/tests/bug38943.inc +++ b/ext/zip/tests/bug38943.inc @@ -13,4 +13,3 @@ class myZip extends ZipArchive { $z = new myZip; $z->testp = "foobar"; var_dump($z); - diff --git a/ext/zlib/config.w32 b/ext/zlib/config.w32 index 985999f762..70bd1a74fa 100644 --- a/ext/zlib/config.w32 +++ b/ext/zlib/config.w32 @@ -17,5 +17,3 @@ if (PHP_ZLIB == "yes") { PHP_ZLIB = "no" } } - - diff --git a/ext/zlib/tests/data.inc b/ext/zlib/tests/data.inc index 441199ff08..bee4e51d9a 100644 --- a/ext/zlib/tests/data.inc +++ b/ext/zlib/tests/data.inc @@ -1,4 +1,3 @@ - <?php $data = <<<QUOTE To be or not to be, that is the question; @@ -85,4 +84,4 @@ That summons thee to heaven or to hell. QUOTE; -?>
\ No newline at end of file +?> diff --git a/ext/zlib/tests/func.inc b/ext/zlib/tests/func.inc index e431afedbf..7556f81e6a 100644 --- a/ext/zlib/tests/func.inc +++ b/ext/zlib/tests/func.inc @@ -16,4 +16,3 @@ function get_zlib_version() return $version; } - diff --git a/ext/zlib/tests/gzopen_include_path.inc b/ext/zlib/tests/gzopen_include_path.inc index 7d6723a815..add04f74de 100644 --- a/ext/zlib/tests/gzopen_include_path.inc +++ b/ext/zlib/tests/gzopen_include_path.inc @@ -89,4 +89,4 @@ function teardown_relative_path() { rmdir($newdir); } } -?>
\ No newline at end of file +?> diff --git a/ext/zlib/tests/reading_include_path.inc b/ext/zlib/tests/reading_include_path.inc index ee71bb9c42..abe80bf69c 100644 --- a/ext/zlib/tests/reading_include_path.inc +++ b/ext/zlib/tests/reading_include_path.inc @@ -24,4 +24,4 @@ foreach($newdirs as $newdir) { } mkdir($workingDir); chdir($workingDir); -?>
\ No newline at end of file +?> @@ -1,4 +1,3 @@ - /* * Local variables: * tab-width: 4 @@ -26,4 +26,3 @@ for f in $CLEANUP_FILES; do cp $f $f.orig grep -v '#line ' $f.orig > $f done - diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h index e0ffccec38..addaf0ce7b 100644 --- a/main/streams/php_streams_int.h +++ b/main/streams/php_streams_int.h @@ -65,4 +65,3 @@ void php_stream_mode_sanitize_fdopen_fopencookie(php_stream *stream, char *resul void php_stream_tidy_wrapper_error_log(php_stream_wrapper *wrapper); void php_stream_display_wrapper_errors(php_stream_wrapper *wrapper, const char *path, const char *caption); - diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 5c144f28b3..50a7f72978 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -1558,5 +1558,3 @@ const php_stream_ops php_stream_userspace_dir_ops = { NULL, /* stat */ NULL /* set_option */ }; - - diff --git a/pear/Makefile.frag b/pear/Makefile.frag index bbe8ec3513..528683ba1b 100644 --- a/pear/Makefile.frag +++ b/pear/Makefile.frag @@ -34,4 +34,3 @@ install-pear: else \ cat $(srcdir)/install-pear.txt; \ fi - diff --git a/pear/fetch.php b/pear/fetch.php index 01d223392e..56767b62cb 100644 --- a/pear/fetch.php +++ b/pear/fetch.php @@ -72,5 +72,3 @@ if (is_resource($fp) && file_put_contents($argv[2], $fp)) { $err = error_get_last(); echo "\nError..\n", $err["message"], "\n"; exit(1); - - diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README index d624141c9f..15ef022d24 100644 --- a/sapi/apache2handler/README +++ b/sapi/apache2handler/README @@ -73,4 +73,3 @@ TODO PHP functions like apache_sub_req (see php_functions.c) Source Code Highlighting Protocol handlers - diff --git a/sapi/apache2handler/config.w32 b/sapi/apache2handler/config.w32 index 5166135b0a..45d6353d28 100644 --- a/sapi/apache2handler/config.w32 +++ b/sapi/apache2handler/config.w32 @@ -54,4 +54,3 @@ if (PHP_APACHE2_4HANDLER != "no") { WARNING("Could not find apache 2.4 libraries/headers"); } } - diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag index 75c72bf8b7..79e2afec25 100644 --- a/sapi/cgi/Makefile.frag +++ b/sapi/cgi/Makefile.frag @@ -10,4 +10,3 @@ install-cgi: $(SAPI_CGI_PATH) @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 - diff --git a/sapi/cli/Makefile.frag b/sapi/cli/Makefile.frag index 8f4f400401..aa1d642b9c 100644 --- a/sapi/cli/Makefile.frag +++ b/sapi/cli/Makefile.frag @@ -10,4 +10,3 @@ install-cli: $(SAPI_CLI_PATH) @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 - diff --git a/sapi/cli/config.w32 b/sapi/cli/config.w32 index ba55be2218..155b2ce838 100644 --- a/sapi/cli/config.w32 +++ b/sapi/cli/config.w32 @@ -23,4 +23,3 @@ if (PHP_CLI_WIN32 == "yes") { SAPI('cli_win32', 'cli_win32.c php_cli_process_title.c ps_title.c', 'php-win.exe', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); ADD_FLAG("LDFLAGS_CLI_WIN32", "/stack:67108864"); } - diff --git a/sapi/cli/tests/php_cli_server.inc b/sapi/cli/tests/php_cli_server.inc index 2a21ba35d0..ff4eef0e12 100644 --- a/sapi/cli/tests/php_cli_server.inc +++ b/sapi/cli/tests/php_cli_server.inc @@ -97,4 +97,3 @@ function php_cli_server_stop($handle) { return $success; } ?> - diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4 index d396a070e8..78e2d15775 100644 --- a/sapi/embed/config.m4 +++ b/sapi/embed/config.m4 @@ -28,4 +28,3 @@ if test "$PHP_EMBED" != "no"; then else AC_MSG_RESULT(no) fi - diff --git a/sapi/fpm/fpm/fpm.c b/sapi/fpm/fpm/fpm.c index 4febc2cf6b..30cb9da010 100644 --- a/sapi/fpm/fpm/fpm.c +++ b/sapi/fpm/fpm/fpm.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -121,4 +120,3 @@ run_child: /* only workers reach this point */ return fpm_globals.listening_socket; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm.h b/sapi/fpm/fpm/fpm.h index 8e3a472a41..f0610ca46d 100644 --- a/sapi/fpm/fpm/fpm.h +++ b/sapi/fpm/fpm/fpm.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_H diff --git a/sapi/fpm/fpm/fpm_arrays.h b/sapi/fpm/fpm/fpm_arrays.h index 13ace02916..82c7cbc09e 100644 --- a/sapi/fpm/fpm/fpm_arrays.h +++ b/sapi/fpm/fpm/fpm_arrays.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_ARRAYS_H diff --git a/sapi/fpm/fpm/fpm_atomic.h b/sapi/fpm/fpm/fpm_atomic.h index cd52d1561a..ec9e4f197d 100644 --- a/sapi/fpm/fpm/fpm_atomic.h +++ b/sapi/fpm/fpm/fpm_atomic.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_ATOMIC_H @@ -164,4 +163,3 @@ static inline int fpm_spinlock(atomic_t *lock, int try_once) /* {{{ */ #define fpm_unlock(lock) lock = 0 #endif - diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c index 740c913571..58f777541d 100644 --- a/sapi/fpm/fpm/fpm_children.c +++ b/sapi/fpm/fpm/fpm_children.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -481,4 +480,3 @@ int fpm_children_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_children.h b/sapi/fpm/fpm/fpm_children.h index 04c857bec7..9d9c1fa7cb 100644 --- a/sapi/fpm/fpm/fpm_children.h +++ b/sapi/fpm/fpm/fpm_children.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_CHILDREN_H diff --git a/sapi/fpm/fpm/fpm_cleanup.c b/sapi/fpm/fpm/fpm_cleanup.c index ae5e66f41b..7c900974a9 100644 --- a/sapi/fpm/fpm/fpm_cleanup.c +++ b/sapi/fpm/fpm/fpm_cleanup.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -48,4 +47,3 @@ void fpm_cleanups_run(int type) /* {{{ */ fpm_array_free(&cleanups); } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_cleanup.h b/sapi/fpm/fpm/fpm_cleanup.h index 0985b48480..8583143fa2 100644 --- a/sapi/fpm/fpm/fpm_cleanup.h +++ b/sapi/fpm/fpm/fpm_cleanup.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_CLEANUP_H @@ -17,4 +16,3 @@ enum { }; #endif - diff --git a/sapi/fpm/fpm/fpm_clock.c b/sapi/fpm/fpm/fpm_clock.c index ce4d9bac93..8568d7928f 100644 --- a/sapi/fpm/fpm/fpm_clock.c +++ b/sapi/fpm/fpm/fpm_clock.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/fpm_clock.h b/sapi/fpm/fpm/fpm_clock.h index 0c51709798..cf92521dcc 100644 --- a/sapi/fpm/fpm/fpm_clock.h +++ b/sapi/fpm/fpm/fpm_clock.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_CLOCK_H diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c index 5c9791436a..1389b802fc 100644 --- a/sapi/fpm/fpm/fpm_conf.c +++ b/sapi/fpm/fpm/fpm_conf.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h index 8491888aa7..44de1f3b03 100644 --- a/sapi/fpm/fpm/fpm_conf.h +++ b/sapi/fpm/fpm/fpm_conf.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_CONF_H @@ -121,4 +120,3 @@ int fpm_conf_write_pid(); int fpm_conf_unlink_pid(); #endif - diff --git a/sapi/fpm/fpm/fpm_config.h b/sapi/fpm/fpm/fpm_config.h index 954d1a52c0..548202fe3a 100644 --- a/sapi/fpm/fpm/fpm_config.h +++ b/sapi/fpm/fpm/fpm_config.h @@ -75,4 +75,3 @@ #else # define HAVE_FPM_LQ 0 #endif - diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c index 99c7cc1ba1..ef7c980efb 100644 --- a/sapi/fpm/fpm/fpm_env.c +++ b/sapi/fpm/fpm/fpm_env.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -276,4 +275,3 @@ int fpm_env_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_env.h b/sapi/fpm/fpm/fpm_env.h index d720307348..d767608740 100644 --- a/sapi/fpm/fpm/fpm_env.h +++ b/sapi/fpm/fpm/fpm_env.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_ENV_H @@ -23,4 +22,3 @@ void clearenv(); #endif #endif - diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c index 818d7a7ac9..1750fab103 100644 --- a/sapi/fpm/fpm/fpm_events.c +++ b/sapi/fpm/fpm/fpm_events.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -536,4 +535,3 @@ int fpm_event_del(struct fpm_event_s *ev) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_events.h b/sapi/fpm/fpm/fpm_events.h index 9b241e7262..e97ede0824 100644 --- a/sapi/fpm/fpm/fpm_events.h +++ b/sapi/fpm/fpm/fpm_events.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_EVENTS_H diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c index 38574d3c6d..a09e80a490 100644 --- a/sapi/fpm/fpm/fpm_log.c +++ b/sapi/fpm/fpm/fpm_log.c @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #include "php.h" diff --git a/sapi/fpm/fpm/fpm_log.h b/sapi/fpm/fpm/fpm_log.h index 7a2b679060..edad81de21 100644 --- a/sapi/fpm/fpm/fpm_log.h +++ b/sapi/fpm/fpm/fpm_log.h @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #ifndef FPM_LOG_H diff --git a/sapi/fpm/fpm/fpm_php.c b/sapi/fpm/fpm/fpm_php.c index 72a23f717c..ab3c5af18e 100644 --- a/sapi/fpm/fpm/fpm_php.c +++ b/sapi/fpm/fpm/fpm_php.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -285,4 +284,3 @@ char* fpm_php_get_string_from_table(zend_string *table, char *key) /* {{{ */ return NULL; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_php.h b/sapi/fpm/fpm/fpm_php.h index 72af62a723..978f3209d5 100644 --- a/sapi/fpm/fpm/fpm_php.h +++ b/sapi/fpm/fpm/fpm_php.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_PHP_H @@ -46,4 +45,3 @@ int fpm_php_limit_extensions(char *path); char* fpm_php_get_string_from_table(zend_string *table, char *key); #endif - diff --git a/sapi/fpm/fpm/fpm_php_trace.c b/sapi/fpm/fpm/fpm_php_trace.c index 20386e979e..3174eef2fb 100644 --- a/sapi/fpm/fpm/fpm_php_trace.c +++ b/sapi/fpm/fpm/fpm_php_trace.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -231,4 +230,3 @@ done0: /* }}} */ #endif - diff --git a/sapi/fpm/fpm/fpm_php_trace.h b/sapi/fpm/fpm/fpm_php_trace.h index 4fb1fb5e4e..6a83cff127 100644 --- a/sapi/fpm/fpm/fpm_php_trace.h +++ b/sapi/fpm/fpm/fpm_php_trace.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_PHP_TRACE_H @@ -9,4 +8,3 @@ struct fpm_child_s; void fpm_php_trace(struct fpm_child_s *); #endif - diff --git a/sapi/fpm/fpm/fpm_process_ctl.c b/sapi/fpm/fpm/fpm_process_ctl.c index 7deb3beef4..771335551e 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.c +++ b/sapi/fpm/fpm/fpm_process_ctl.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -535,4 +534,3 @@ void fpm_pctl_on_socket_accept(struct fpm_event_s *ev, short which, void *arg) / zlog(ZLOG_DEBUG, "[pool %s] got accept without idle child available .... I forked", wp->config->name); } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_process_ctl.h b/sapi/fpm/fpm/fpm_process_ctl.h index eb1f237e88..f39a489f61 100644 --- a/sapi/fpm/fpm/fpm_process_ctl.h +++ b/sapi/fpm/fpm/fpm_process_ctl.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_PROCESS_CTL_H @@ -49,4 +48,3 @@ enum { }; #endif - diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c index 6c819340b4..372df4a82d 100644 --- a/sapi/fpm/fpm/fpm_request.c +++ b/sapi/fpm/fpm/fpm_request.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifdef HAVE_TIMES #include <sys/times.h> diff --git a/sapi/fpm/fpm/fpm_request.h b/sapi/fpm/fpm/fpm_request.h index bccf0dd8c3..782d02dc21 100644 --- a/sapi/fpm/fpm/fpm_request.h +++ b/sapi/fpm/fpm/fpm_request.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_REQUEST_H diff --git a/sapi/fpm/fpm/fpm_scoreboard.c b/sapi/fpm/fpm/fpm_scoreboard.c index 4de910a67a..328f999f0c 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.c +++ b/sapi/fpm/fpm/fpm_scoreboard.c @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #include "php.h" @@ -335,4 +334,3 @@ float fpm_scoreboard_get_tick() /* {{{ */ } /* }}} */ #endif - diff --git a/sapi/fpm/fpm/fpm_scoreboard.h b/sapi/fpm/fpm/fpm_scoreboard.h index d71b7ad857..1fecde1d0f 100644 --- a/sapi/fpm/fpm/fpm_scoreboard.h +++ b/sapi/fpm/fpm/fpm_scoreboard.h @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #ifndef FPM_SCOREBOARD_H diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c index b7b5770730..52ae60ed28 100644 --- a/sapi/fpm/fpm/fpm_shm.c +++ b/sapi/fpm/fpm/fpm_shm.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin, Jerome Loyet */ #include <sys/mman.h> diff --git a/sapi/fpm/fpm/fpm_shm.h b/sapi/fpm/fpm/fpm_shm.h index 249c0d68a6..4382aac29b 100644 --- a/sapi/fpm/fpm/fpm_shm.h +++ b/sapi/fpm/fpm/fpm_shm.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_SHM_H @@ -9,4 +8,3 @@ int fpm_shm_free(void *mem, size_t size); size_t fpm_shm_get_size_allocated(); #endif - diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c index a244eb173a..1b97025ea7 100644 --- a/sapi/fpm/fpm/fpm_signals.c +++ b/sapi/fpm/fpm/fpm_signals.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -251,4 +250,3 @@ int fpm_signals_get_fd() /* {{{ */ return sp[0]; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_signals.h b/sapi/fpm/fpm/fpm_signals.h index 768f0ae2a2..7202816218 100644 --- a/sapi/fpm/fpm/fpm_signals.h +++ b/sapi/fpm/fpm/fpm_signals.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_SIGNALS_H diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c index a79c552b4f..aaa16cc89e 100644 --- a/sapi/fpm/fpm/fpm_sockets.c +++ b/sapi/fpm/fpm/fpm_sockets.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h index f7fcba16d7..9d899c0757 100644 --- a/sapi/fpm/fpm/fpm_sockets.h +++ b/sapi/fpm/fpm/fpm_sockets.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_MISC_H diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c index b104288ff4..36d2240635 100644 --- a/sapi/fpm/fpm/fpm_status.c +++ b/sapi/fpm/fpm/fpm_status.c @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #include "php.h" diff --git a/sapi/fpm/fpm/fpm_status.h b/sapi/fpm/fpm/fpm_status.h index 8d91b44a06..bc90c6a9df 100644 --- a/sapi/fpm/fpm/fpm_status.h +++ b/sapi/fpm/fpm/fpm_status.h @@ -1,4 +1,3 @@ - /* (c) 2009 Jerome Loyet */ #ifndef FPM_STATUS_H diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c index f5768cc506..ba8f6d8213 100644 --- a/sapi/fpm/fpm/fpm_stdio.c +++ b/sapi/fpm/fpm/fpm_stdio.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -339,4 +338,3 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_stdio.h b/sapi/fpm/fpm/fpm_stdio.h index 1e16ec0956..7ebe80e66e 100644 --- a/sapi/fpm/fpm/fpm_stdio.h +++ b/sapi/fpm/fpm/fpm_stdio.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_STDIO_H @@ -17,4 +16,3 @@ int fpm_stdio_discard_pipes(struct fpm_child_s *child); int fpm_stdio_open_error_log(int reopen); #endif - diff --git a/sapi/fpm/fpm/fpm_str.h b/sapi/fpm/fpm/fpm_str.h index 4927b02644..efd05507c4 100644 --- a/sapi/fpm/fpm/fpm_str.h +++ b/sapi/fpm/fpm/fpm_str.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_STR_H diff --git a/sapi/fpm/fpm/fpm_systemd.c b/sapi/fpm/fpm/fpm_systemd.c index 95d12c97f2..31b6a3d27a 100644 --- a/sapi/fpm/fpm/fpm_systemd.c +++ b/sapi/fpm/fpm/fpm_systemd.c @@ -110,4 +110,3 @@ int fpm_systemd_conf() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_systemd.h b/sapi/fpm/fpm/fpm_systemd.h index 3ee6217717..e978a7c7be 100644 --- a/sapi/fpm/fpm/fpm_systemd.h +++ b/sapi/fpm/fpm/fpm_systemd.h @@ -10,4 +10,3 @@ void fpm_systemd_heartbeat(struct fpm_event_s *ev, short which, void *arg); int fpm_systemd_conf(); #endif - diff --git a/sapi/fpm/fpm/fpm_trace.c b/sapi/fpm/fpm/fpm_trace.c index b76dc88022..3d0b9de98a 100644 --- a/sapi/fpm/fpm/fpm_trace.c +++ b/sapi/fpm/fpm/fpm_trace.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -32,5 +31,3 @@ int fpm_trace_get_strz(char *buf, size_t sz, long addr) /* {{{ */ } } /* }}} */ - - diff --git a/sapi/fpm/fpm/fpm_trace.h b/sapi/fpm/fpm/fpm_trace.h index 269278eb93..4ee021229d 100644 --- a/sapi/fpm/fpm/fpm_trace.h +++ b/sapi/fpm/fpm/fpm_trace.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_TRACE_H @@ -13,4 +12,3 @@ int fpm_trace_get_long(long addr, long *data); int fpm_trace_get_strz(char *buf, size_t sz, long addr); #endif - diff --git a/sapi/fpm/fpm/fpm_trace_mach.c b/sapi/fpm/fpm/fpm_trace_mach.c index 7a8a434829..1ecee23d26 100644 --- a/sapi/fpm/fpm/fpm_trace_mach.c +++ b/sapi/fpm/fpm/fpm_trace_mach.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -94,5 +93,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - - diff --git a/sapi/fpm/fpm/fpm_trace_pread.c b/sapi/fpm/fpm/fpm_trace_pread.c index e8e32e4719..604882eff3 100644 --- a/sapi/fpm/fpm/fpm_trace_pread.c +++ b/sapi/fpm/fpm/fpm_trace_pread.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #define _GNU_SOURCE @@ -63,4 +62,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_trace_ptrace.c b/sapi/fpm/fpm/fpm_trace_ptrace.c index 875170f6de..a2a3d25e30 100644 --- a/sapi/fpm/fpm/fpm_trace_ptrace.c +++ b/sapi/fpm/fpm/fpm_trace_ptrace.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -78,4 +77,3 @@ int fpm_trace_get_long(long addr, long *data) /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c index ea5cdad6e2..6490a7b5ba 100644 --- a/sapi/fpm/fpm/fpm_unix.c +++ b/sapi/fpm/fpm/fpm_unix.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" @@ -578,4 +577,3 @@ int fpm_unix_init_main() /* {{{ */ return 0; } /* }}} */ - diff --git a/sapi/fpm/fpm/fpm_unix.h b/sapi/fpm/fpm/fpm_unix.h index cd7faf9d73..c65791f7ed 100644 --- a/sapi/fpm/fpm/fpm_unix.h +++ b/sapi/fpm/fpm/fpm_unix.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_UNIX_H @@ -16,4 +15,3 @@ int fpm_unix_init_main(); extern size_t fpm_pagesize; #endif - diff --git a/sapi/fpm/fpm/fpm_worker_pool.c b/sapi/fpm/fpm/fpm_worker_pool.c index 472a684e93..e4ad73169d 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.c +++ b/sapi/fpm/fpm/fpm_worker_pool.c @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/fpm_worker_pool.h b/sapi/fpm/fpm/fpm_worker_pool.h index b78afe65a5..37f4e51994 100644 --- a/sapi/fpm/fpm/fpm_worker_pool.h +++ b/sapi/fpm/fpm/fpm_worker_pool.h @@ -1,4 +1,3 @@ - /* (c) 2007,2008 Andrei Nigmatulin */ #ifndef FPM_WORKER_POOL_H @@ -54,4 +53,3 @@ int fpm_worker_pool_init_main(); extern struct fpm_worker_pool_s *fpm_worker_all_pools; #endif - diff --git a/sapi/fpm/fpm/zlog.c b/sapi/fpm/fpm/zlog.c index c507e931e5..09193fd5ac 100644 --- a/sapi/fpm/fpm/zlog.c +++ b/sapi/fpm/fpm/zlog.c @@ -1,4 +1,3 @@ - /* (c) 2004-2007 Andrei Nigmatulin */ #include "fpm_config.h" diff --git a/sapi/fpm/fpm/zlog.h b/sapi/fpm/fpm/zlog.h index 4b9f732cdf..6e96048d09 100644 --- a/sapi/fpm/fpm/zlog.h +++ b/sapi/fpm/fpm/zlog.h @@ -1,4 +1,3 @@ - /* (c) 2004-2007 Andrei Nigmatulin */ #ifndef ZLOG_H diff --git a/sapi/fpm/php-fpm.service.in b/sapi/fpm/php-fpm.service.in index a4d533c197..8a541c0865 100644 --- a/sapi/fpm/php-fpm.service.in +++ b/sapi/fpm/php-fpm.service.in @@ -15,4 +15,3 @@ PrivateTmp=true [Install] WantedBy=multi-user.target - diff --git a/sapi/fpm/tests/response.inc b/sapi/fpm/tests/response.inc index 2ca9b1e5bc..54f85bcfb6 100644 --- a/sapi/fpm/tests/response.inc +++ b/sapi/fpm/tests/response.inc @@ -278,4 +278,4 @@ class Response return false; } -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/skipif.inc b/sapi/fpm/tests/skipif.inc index 25910a8e05..eec65a4112 100644 --- a/sapi/fpm/tests/skipif.inc +++ b/sapi/fpm/tests/skipif.inc @@ -12,4 +12,4 @@ require_once "tester.inc"; if (!FPM\Tester::findExecutable()) { die("skip php-fpm binary not found"); -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/status.inc b/sapi/fpm/tests/status.inc index 5965f130eb..39005de568 100644 --- a/sapi/fpm/tests/status.inc +++ b/sapi/fpm/tests/status.inc @@ -196,4 +196,4 @@ class Status true ); } -}
\ No newline at end of file +} diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc index c3b6c83e59..70c03ad70f 100644 --- a/sapi/fpm/tests/tester.inc +++ b/sapi/fpm/tests/tester.inc @@ -1180,4 +1180,4 @@ class Tester print file_get_contents($accessLog); } } -}
\ No newline at end of file +} diff --git a/sapi/litespeed/README.md b/sapi/litespeed/README.md index e744030de7..3f5b7ad14f 100644 --- a/sapi/litespeed/README.md +++ b/sapi/litespeed/README.md @@ -219,7 +219,3 @@ For support questions, please post to our free support forum, at: https://www.litespeedtech.com/support/forum/ For bug report, please send bug report to bug [at] litespeedtech.com. - - - - diff --git a/sapi/litespeed/lsapidef.h b/sapi/litespeed/lsapidef.h index 4db8ff562d..f6c0cb0231 100644 --- a/sapi/litespeed/lsapidef.h +++ b/sapi/litespeed/lsapidef.h @@ -193,4 +193,3 @@ struct lsapi_resp_header #endif - diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index 685892e708..a93cdc345d 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -3962,5 +3962,3 @@ int LSAPI_Inc_Req_Processed(int cnt) { return __sync_add_and_fetch(s_global_counter, cnt); } - - diff --git a/sapi/litespeed/lsapilib.h b/sapi/litespeed/lsapilib.h index 1fd3f56176..ff27c9cd94 100644 --- a/sapi/litespeed/lsapilib.h +++ b/sapi/litespeed/lsapilib.h @@ -418,10 +418,3 @@ void LSAPI_Log(int flag, const char * fmt, ...) #endif - - - - - - - diff --git a/sapi/litespeed/lscriu.h b/sapi/litespeed/lscriu.h index cc0186ef79..02fc9b880a 100644 --- a/sapi/litespeed/lscriu.h +++ b/sapi/litespeed/lscriu.h @@ -64,4 +64,4 @@ void LSCRIU_inc_req_procssed(void); } #endif -#endif // LSCRIU_
\ No newline at end of file +#endif // LSCRIU_ diff --git a/sapi/phpdbg/Makefile.frag b/sapi/phpdbg/Makefile.frag index 091b1e831c..65377e608a 100644 --- a/sapi/phpdbg/Makefile.frag +++ b/sapi/phpdbg/Makefile.frag @@ -39,4 +39,3 @@ test-phpdbg: @$(top_builddir)/sapi/cli/php sapi/phpdbg/tests/run-tests.php --phpdbg sapi/phpdbg/phpdbg .PHONY: clean-phpdbg test-phpdbg - diff --git a/sapi/phpdbg/config.w32 b/sapi/phpdbg/config.w32 index e69ca455f7..9aca03dff6 100644 --- a/sapi/phpdbg/config.w32 +++ b/sapi/phpdbg/config.w32 @@ -31,4 +31,3 @@ if (PHP_PHPDBGS == "yes") { ADD_FLAG("LIBS_PHPDBGS", "ws2_32.lib user32.lib"); ADD_FLAG("CFLAGS_PHPDBGS", "/D YY_NO_UNISTD_H"); } - diff --git a/sapi/phpdbg/phpdbg_eol.h b/sapi/phpdbg/phpdbg_eol.h index afc31a906e..8d6ee8278e 100644 --- a/sapi/phpdbg/phpdbg_eol.h +++ b/sapi/phpdbg/phpdbg_eol.h @@ -43,4 +43,3 @@ char *phpdbg_eol_rep(int id); void phpdbg_eol_convert(char **str, int *len); #endif /* PHPDBG_EOL_H */ - diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 150647aa7e..1f26f7983b 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -353,4 +353,3 @@ PHPDBG_API void phpdbg_close_socket(int sock) { #endif } } - diff --git a/sapi/phpdbg/phpdbg_io.h b/sapi/phpdbg/phpdbg_io.h index d0b69d9b41..deda272da2 100644 --- a/sapi/phpdbg/phpdbg_io.h +++ b/sapi/phpdbg/phpdbg_io.h @@ -38,4 +38,3 @@ PHPDBG_API int phpdbg_open_socket(const char *interface, unsigned short port); PHPDBG_API void phpdbg_close_socket(int sock); #endif /* PHPDBG_IO_H */ - diff --git a/sapi/phpdbg/phpdbg_sigio_win32.c b/sapi/phpdbg/phpdbg_sigio_win32.c index b86ea05da2..3ca0ad8d37 100644 --- a/sapi/phpdbg/phpdbg_sigio_win32.c +++ b/sapi/phpdbg/phpdbg_sigio_win32.c @@ -109,4 +109,3 @@ sigio_watcher_stop(void) PHPDBG_G(swd).fd = -1; PHPDBG_G(sigio_watcher_thread) = INVALID_HANDLE_VALUE; } - diff --git a/sapi/phpdbg/phpdbg_sigsafe.c b/sapi/phpdbg/phpdbg_sigsafe.c index 081d864c5c..dab0d27d85 100644 --- a/sapi/phpdbg/phpdbg_sigsafe.c +++ b/sapi/phpdbg/phpdbg_sigsafe.c @@ -56,4 +56,3 @@ void phpdbg_clear_sigsafe_mem(void) { zend_bool phpdbg_active_sigsafe_mem(void) { return !!PHPDBG_G(sigsafe_mem).mem; } - diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index b3480a6218..fdf67f0438 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -1,4 +1,3 @@ - # # Build environment install # diff --git a/scripts/dev/find_tested.php b/scripts/dev/find_tested.php index c2a223b776..9368ad3796 100755 --- a/scripts/dev/find_tested.php +++ b/scripts/dev/find_tested.php @@ -226,4 +226,3 @@ function map_token_value($x) { ?> - diff --git a/scripts/dev/gen_verify_stub b/scripts/dev/gen_verify_stub index ac6dc4434d..f326230e5d 100755 --- a/scripts/dev/gen_verify_stub +++ b/scripts/dev/gen_verify_stub @@ -48,4 +48,3 @@ do done exit 0 - diff --git a/tests/basic/timeout_config.inc b/tests/basic/timeout_config.inc index 7182080939..3bd9eeaa70 100644 --- a/tests/basic/timeout_config.inc +++ b/tests/basic/timeout_config.inc @@ -8,4 +8,3 @@ function busy_wait($how_long) while ($until > microtime(TRUE)); } - diff --git a/tests/lang/bug73172.inc b/tests/lang/bug73172.inc index 5e4a85ea2e..760cbecc8b 100644 --- a/tests/lang/bug73172.inc +++ b/tests/lang/bug73172.inc @@ -4,4 +4,3 @@ function test($a, $x, $y){ return; } test('test', 9223372036854775808, 'test'); - diff --git a/tests/quicktester.inc b/tests/quicktester.inc index 70cb115684..ba60e74a51 100644 --- a/tests/quicktester.inc +++ b/tests/quicktester.inc @@ -72,4 +72,3 @@ foreach ($tests as $n=>$test) } } if ($success) echo "OK"; - diff --git a/tests/security/open_basedir.inc b/tests/security/open_basedir.inc index d229f8497f..d30f2f8384 100644 --- a/tests/security/open_basedir.inc +++ b/tests/security/open_basedir.inc @@ -136,4 +136,3 @@ function test_open_basedir($function) { } ?> - diff --git a/travis/ext/pdo_pgsql/setup.sh b/travis/ext/pdo_pgsql/setup.sh index 6f16f72cc2..5f3cf67f92 100755 --- a/travis/ext/pdo_pgsql/setup.sh +++ b/travis/ext/pdo_pgsql/setup.sh @@ -1,2 +1,2 @@ #!/bin/bash -export PDO_PGSQL_TEST_DSN='pgsql:host=localhost port=5432 dbname=test user=postgres password='
\ No newline at end of file +export PDO_PGSQL_TEST_DSN='pgsql:host=localhost port=5432 dbname=test user=postgres password=' diff --git a/travis/ext/pgsql/setup.sh b/travis/ext/pgsql/setup.sh index ef13733edc..108f47db25 100755 --- a/travis/ext/pgsql/setup.sh +++ b/travis/ext/pgsql/setup.sh @@ -1,4 +1,4 @@ #!/bin/bash echo ' <?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc" -psql -c 'create database test;' -U postgres
\ No newline at end of file +psql -c 'create database test;' -U postgres diff --git a/win32/build/Makefile b/win32/build/Makefile index 29ec59d9b6..d52f3ef5b0 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -265,4 +265,3 @@ really-install: @echo Registering event source with syslog (requires admin rights) @echo It's okay for this step to fail: -$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL) - diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize index 517db128bd..37c449a059 100644 --- a/win32/build/Makefile.phpize +++ b/win32/build/Makefile.phpize @@ -57,4 +57,3 @@ _VC_MANIFEST_EMBED_DLL= if exist $@.manifest $(MT) -nologo -manifest $@.manifest !endif install: build-headers build-bins - diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index ff8025362a..e76aff0000 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -259,4 +259,3 @@ C.Write(file_get_contents("win32/build/configure.tail")); B.WriteLine("@echo off"); B.WriteLine("cscript /nologo configure.js %*"); - diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 7fff0b3e4f..9fbbe8b7d2 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -363,4 +363,3 @@ ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations might not work properly, if the chosen instruction sets are not available on the target \ processor.", "no"); toolset_setup_intrinsic_cflags(); - diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 0a70e3aaf1..642da0021d 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -175,4 +175,3 @@ #ifdef __clang__ #define HAVE_FUNC_ATTRIBUTE_TARGET 1 #endif - diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 6acbfdfb86..72205fac34 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -135,4 +135,3 @@ ARG_ENABLE("native-intrinsics", "Comma separated list of intrinsic optimizations might not work properly, if the optimizations are not available on the target \ processor.", "no"); toolset_setup_intrinsic_cflags(); - diff --git a/win32/build/configure.tail b/win32/build/configure.tail index c06b03d362..a836053444 100644 --- a/win32/build/configure.tail +++ b/win32/build/configure.tail @@ -7,4 +7,3 @@ if (!MODE_PHPIZE && sapi_enabled.length < 1) { } generate_files(); - diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 354b105e35..95683eb157 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3705,4 +3705,3 @@ function setup_verbosity() CMD_MOD2 = "@"; } } - diff --git a/win32/build/phpize.bat b/win32/build/phpize.bat index 794b9cb710..a79885f008 100644 --- a/win32/build/phpize.bat +++ b/win32/build/phpize.bat @@ -8,4 +8,3 @@ IF NOT EXIST configure.bat ( echo Now run 'configure --help' ) SET PHP_BUILDCONF_PATH= - diff --git a/win32/build/wsyslog.mc b/win32/build/wsyslog.mc index 01d4d3a86b..f326abf7d9 100644 --- a/win32/build/wsyslog.mc +++ b/win32/build/wsyslog.mc @@ -25,4 +25,3 @@ SymbolicName=PHP_SYSLOG_ERROR_TYPE Language=English %1 %2 . - diff --git a/win32/cp_enc_map_gen.c b/win32/cp_enc_map_gen.c index 2010e0ca4c..34861d148b 100644 --- a/win32/cp_enc_map_gen.c +++ b/win32/cp_enc_map_gen.c @@ -1,4 +1,3 @@ - #include <stdio.h> #include <windows.h> diff --git a/win32/param.h b/win32/param.h index 1601a3cc16..552323c5b1 100644 --- a/win32/param.h +++ b/win32/param.h @@ -1,4 +1,3 @@ - /***************************************************************************** * * * sys/param.c * |