diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 12:51:01 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-14 12:51:01 +0200 |
commit | 03f3b8479b88688e45fd0879b755937fd01f593a (patch) | |
tree | 8cab94a81a619098de26c9a8a9f7060b4229710f /win32 | |
parent | ed64e1d59a546b63334d94f31304921f3d156609 (diff) | |
download | php-git-03f3b8479b88688e45fd0879b755937fd01f593a.tar.gz |
Sync leading and final newlines in source code files
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'win32')
-rw-r--r-- | win32/build/Makefile | 1 | ||||
-rw-r--r-- | win32/build/Makefile.phpize | 1 | ||||
-rw-r--r-- | win32/build/config.w32 | 1 | ||||
-rw-r--r-- | win32/build/config.w32.phpize.in | 1 | ||||
-rw-r--r-- | win32/build/configure.tail | 1 | ||||
-rw-r--r-- | win32/build/confutils.js | 1 | ||||
-rw-r--r-- | win32/build/phpize.bat | 1 | ||||
-rwxr-xr-x | win32/build/wsyslog.mc | 1 | ||||
-rw-r--r-- | win32/cp_enc_map_gen.c | 2 | ||||
-rw-r--r-- | win32/dllmain.c | 1 | ||||
-rw-r--r-- | win32/ftok.c | 1 | ||||
-rw-r--r-- | win32/getrusage.h | 1 | ||||
-rw-r--r-- | win32/param.h | 1 | ||||
-rw-r--r-- | win32/php_inttypes.h | 1 | ||||
-rw-r--r-- | win32/php_win32_globals.h | 1 | ||||
-rw-r--r-- | win32/select.h | 1 | ||||
-rw-r--r-- | win32/winutil.h | 1 |
17 files changed, 0 insertions, 18 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 59077d09b8..bb9144bcac 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -249,4 +249,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/config.w32 b/win32/build/config.w32 index 05ad6e194a..ff1cbb864c 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -318,4 +318,3 @@ ARG_ENABLE("test-ini", "Enable automatic php.ini generation. The test.ini will b ARG_WITH("test-ini-ext-exclude", "Comma separated list of shared extensions to \ be excluded from the test.ini", "no"); - diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index 812d28faf5..f43ebeb6a6 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -125,4 +125,3 @@ DEFINE("PHP_DIR", PHP_DIR); ARG_WITH("codegen-arch", "Architecture for code generation", "no"); toolset_setup_codegen_arch(); - diff --git a/win32/build/configure.tail b/win32/build/configure.tail index 70625a43d4..d17d4ae67b 100644 --- a/win32/build/configure.tail +++ b/win32/build/configure.tail @@ -8,4 +8,3 @@ if (!MODE_PHPIZE && sapi_enabled.length < 1) { } generate_files(); - diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 1bf452e967..28f2129fa4 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3346,4 +3346,3 @@ function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part return ret; } - 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 100755 --- 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 d27e28e82b..bd2f108287 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> @@ -247,4 +246,3 @@ main(int argc, char **argv) return 0; } - diff --git a/win32/dllmain.c b/win32/dllmain.c index 947c38d5ad..2c59d62629 100644 --- a/win32/dllmain.c +++ b/win32/dllmain.c @@ -78,4 +78,3 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID dummy) return ret; } - diff --git a/win32/ftok.c b/win32/ftok.c index 429133043e..164651d332 100644 --- a/win32/ftok.c +++ b/win32/ftok.c @@ -59,4 +59,3 @@ ftok(const char *pathname, int proj_id) return ret; } - diff --git a/win32/getrusage.h b/win32/getrusage.h index 59e0b2d5dd..bc3898436a 100644 --- a/win32/getrusage.h +++ b/win32/getrusage.h @@ -114,4 +114,3 @@ struct rusage PHPAPI int getrusage(int who, struct rusage *usage); #endif - diff --git a/win32/param.h b/win32/param.h index f312b03b18..3c14992f64 100644 --- a/win32/param.h +++ b/win32/param.h @@ -1,4 +1,3 @@ - /***************************************************************************** * * * sys/param.c * diff --git a/win32/php_inttypes.h b/win32/php_inttypes.h index 4130649cf2..20e9c9b775 100644 --- a/win32/php_inttypes.h +++ b/win32/php_inttypes.h @@ -311,4 +311,3 @@ imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) #else #include <inttypes.h> #endif - diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 6451e0e049..8b721a0d62 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -55,4 +55,3 @@ void php_win32_core_globals_dtor(void *vg); PHP_RSHUTDOWN_FUNCTION(win32_core_globals); #endif - diff --git a/win32/select.h b/win32/select.h index 8c4a93d224..4bc0ac5a88 100644 --- a/win32/select.h +++ b/win32/select.h @@ -19,4 +19,3 @@ /* $Id$ */ PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv); - diff --git a/win32/winutil.h b/win32/winutil.h index ad1aad741a..0947a66608 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -53,4 +53,3 @@ PHP_WINUTIL_API int php_win32_code_to_errno(unsigned long w32Err); } while (0) PHP_WINUTIL_API char *php_win32_get_username(void); - |