From 1ad08256f349fa513157437abc4feb245cce03fc Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 14 Oct 2018 12:56:38 +0200 Subject: 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-' ' characters plus a terminating '' 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 --- sapi/apache2handler/README | 1 - sapi/apache2handler/config.w32 | 1 - sapi/cgi/Makefile.frag | 1 - sapi/cli/Makefile.frag | 1 - sapi/cli/config.w32 | 1 - sapi/cli/tests/php_cli_server.inc | 1 - sapi/embed/config.m4 | 1 - sapi/fpm/fpm/fpm.c | 2 -- sapi/fpm/fpm/fpm.h | 1 - sapi/fpm/fpm/fpm_arrays.h | 1 - sapi/fpm/fpm/fpm_atomic.h | 2 -- sapi/fpm/fpm/fpm_children.c | 2 -- sapi/fpm/fpm/fpm_children.h | 1 - sapi/fpm/fpm/fpm_cleanup.c | 2 -- sapi/fpm/fpm/fpm_cleanup.h | 2 -- sapi/fpm/fpm/fpm_clock.c | 1 - sapi/fpm/fpm/fpm_clock.h | 1 - sapi/fpm/fpm/fpm_conf.c | 1 - sapi/fpm/fpm/fpm_conf.h | 2 -- sapi/fpm/fpm/fpm_config.h | 1 - sapi/fpm/fpm/fpm_env.c | 2 -- sapi/fpm/fpm/fpm_env.h | 2 -- sapi/fpm/fpm/fpm_events.c | 2 -- sapi/fpm/fpm/fpm_events.h | 1 - sapi/fpm/fpm/fpm_log.c | 1 - sapi/fpm/fpm/fpm_log.h | 1 - sapi/fpm/fpm/fpm_php.c | 2 -- sapi/fpm/fpm/fpm_php.h | 2 -- sapi/fpm/fpm/fpm_php_trace.c | 2 -- sapi/fpm/fpm/fpm_php_trace.h | 2 -- sapi/fpm/fpm/fpm_process_ctl.c | 2 -- sapi/fpm/fpm/fpm_process_ctl.h | 2 -- sapi/fpm/fpm/fpm_request.c | 1 - sapi/fpm/fpm/fpm_request.h | 1 - sapi/fpm/fpm/fpm_scoreboard.c | 2 -- sapi/fpm/fpm/fpm_scoreboard.h | 1 - sapi/fpm/fpm/fpm_shm.c | 1 - sapi/fpm/fpm/fpm_shm.h | 2 -- sapi/fpm/fpm/fpm_signals.c | 2 -- sapi/fpm/fpm/fpm_signals.h | 1 - sapi/fpm/fpm/fpm_sockets.c | 1 - sapi/fpm/fpm/fpm_sockets.h | 1 - sapi/fpm/fpm/fpm_status.c | 1 - sapi/fpm/fpm/fpm_status.h | 1 - sapi/fpm/fpm/fpm_stdio.c | 2 -- sapi/fpm/fpm/fpm_stdio.h | 2 -- sapi/fpm/fpm/fpm_str.h | 1 - sapi/fpm/fpm/fpm_systemd.c | 1 - sapi/fpm/fpm/fpm_systemd.h | 1 - sapi/fpm/fpm/fpm_trace.c | 3 --- sapi/fpm/fpm/fpm_trace.h | 2 -- sapi/fpm/fpm/fpm_trace_mach.c | 3 --- sapi/fpm/fpm/fpm_trace_pread.c | 2 -- sapi/fpm/fpm/fpm_trace_ptrace.c | 2 -- sapi/fpm/fpm/fpm_unix.c | 2 -- sapi/fpm/fpm/fpm_unix.h | 2 -- sapi/fpm/fpm/fpm_worker_pool.c | 1 - sapi/fpm/fpm/fpm_worker_pool.h | 2 -- sapi/fpm/fpm/zlog.c | 1 - sapi/fpm/fpm/zlog.h | 1 - sapi/fpm/php-fpm.service.in | 1 - sapi/fpm/tests/response.inc | 2 +- sapi/fpm/tests/skipif.inc | 2 +- sapi/fpm/tests/status.inc | 2 +- sapi/fpm/tests/tester.inc | 2 +- sapi/litespeed/README.md | 4 ---- sapi/litespeed/lsapidef.h | 1 - sapi/litespeed/lsapilib.c | 2 -- sapi/litespeed/lsapilib.h | 7 ------- sapi/litespeed/lscriu.h | 2 +- sapi/phpdbg/Makefile.frag | 1 - sapi/phpdbg/config.w32 | 1 - sapi/phpdbg/phpdbg_eol.h | 1 - sapi/phpdbg/phpdbg_io.c | 1 - sapi/phpdbg/phpdbg_io.h | 1 - sapi/phpdbg/phpdbg_sigio_win32.c | 1 - sapi/phpdbg/phpdbg_sigsafe.c | 1 - 77 files changed, 5 insertions(+), 117 deletions(-) (limited to 'sapi') 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 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 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; } - -- cgit v1.2.1