From ebe6d9d8758d36e03cf39b6587597c67ab778436 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 5 Oct 2017 14:40:24 +0200 Subject: whitespace and comment format fixes, no code changes Signed-off-by: Denys Vlasenko --- libbb/ask_confirmation.c | 3 +-- libbb/bb_askpass.c | 1 - libbb/bb_do_delay.c | 1 - libbb/bb_pwd.c | 1 - libbb/bb_qsort.c | 1 - libbb/bb_strtod.c | 1 - libbb/bb_strtonum.c | 1 - libbb/bbunit.c | 2 +- libbb/change_identity.c | 1 - libbb/chomp.c | 1 - libbb/compare_string_array.c | 1 - libbb/concat_path_file.c | 3 +-- libbb/concat_subpath_file.c | 3 +-- libbb/copyfd.c | 1 - libbb/correct_password.c | 1 - libbb/crc32.c | 1 - libbb/default_error_retval.c | 2 -- libbb/device_open.c | 1 - libbb/die_if_bad_username.c | 1 - libbb/dump.c | 1 - libbb/executable.c | 1 - libbb/fclose_nonstdin.c | 4 +--- libbb/fflush_stdout_and_exit.c | 4 +--- libbb/fgets_str.c | 1 - libbb/find_mount_point.c | 1 - libbb/find_pid_by_name.c | 1 - libbb/find_root_device.c | 1 - libbb/full_write.c | 1 - libbb/get_console.c | 1 - libbb/get_line_from_file.c | 1 - libbb/getpty.c | 1 - libbb/hash_md5_sha.c | 1 - libbb/human_readable.c | 1 - libbb/in_ether.c | 1 - libbb/inet_common.c | 1 - libbb/inode_hash.c | 1 - libbb/isdirectory.c | 1 - libbb/kernel_version.c | 2 -- libbb/last_char_is.c | 1 - libbb/llist.c | 1 - libbb/login.c | 1 - libbb/make_directory.c | 2 -- libbb/match_fstype.c | 1 - libbb/messages.c | 1 - libbb/mode_string.c | 2 -- libbb/mtab.c | 1 - libbb/nuke_str.c | 1 - libbb/parse_mode.c | 3 +-- libbb/percent_decode.c | 1 - libbb/printable.c | 1 - libbb/process_escape_sequence.c | 1 - libbb/procps.c | 1 - libbb/ptr_to_globals.c | 1 - libbb/pw_encrypt.c | 1 - libbb/recursive_action.c | 1 - libbb/remove_file.c | 1 - libbb/replace.c | 1 - libbb/run_shell.c | 1 - libbb/safe_gethostname.c | 2 -- libbb/safe_poll.c | 1 - libbb/safe_strncpy.c | 1 - libbb/safe_write.c | 1 - libbb/setup_environment.c | 1 - libbb/signals.c | 1 - libbb/skip_whitespace.c | 1 - libbb/speed_table.c | 1 - libbb/strrstr.c | 1 - libbb/trim.c | 1 - libbb/uuencode.c | 1 - libbb/wfopen.c | 1 - libbb/wfopen_input.c | 3 +-- libbb/write.c | 1 - libbb/xatonum.c | 1 - libbb/xconnect.c | 1 - libbb/xfunc_die.c | 3 +-- libbb/xfuncs.c | 2 -- libbb/xfuncs_printf.c | 2 -- libbb/xgetcwd.c | 1 - libbb/xreadlink.c | 1 - libbb/xrealloc_vector.c | 1 - libbb/xregcomp.c | 1 - 81 files changed, 9 insertions(+), 98 deletions(-) (limited to 'libbb') diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c index d95729cc9..6fbed89f4 100644 --- a/libbb/ask_confirmation.c +++ b/libbb/ask_confirmation.c @@ -6,12 +6,11 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +#include "libbb.h" /* Read a line from stdin. If the first non-whitespace char is 'y' or 'Y', * return 1. Otherwise return 0. */ -#include "libbb.h" - int FAST_FUNC bb_ask_confirmation(void) { char first = 0; diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c index c2580b9eb..aae35ec41 100644 --- a/libbb/bb_askpass.c +++ b/libbb/bb_askpass.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* do nothing signal handler */ diff --git a/libbb/bb_do_delay.c b/libbb/bb_do_delay.c index 05c879fb9..65541704b 100644 --- a/libbb/bb_do_delay.c +++ b/libbb/bb_do_delay.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" void FAST_FUNC bb_do_delay(int seconds) diff --git a/libbb/bb_pwd.c b/libbb/bb_pwd.c index dca0a150b..32ff83a42 100644 --- a/libbb/bb_pwd.c +++ b/libbb/bb_pwd.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* TODO: maybe change API to return malloced data? diff --git a/libbb/bb_qsort.c b/libbb/bb_qsort.c index a54e7236a..505045533 100644 --- a/libbb/bb_qsort.c +++ b/libbb/bb_qsort.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" int /* not FAST_FUNC! */ bb_pstrcmp(const void *a, const void *b) diff --git a/libbb/bb_strtod.c b/libbb/bb_strtod.c index 5dde78414..5e1d0535e 100644 --- a/libbb/bb_strtod.c +++ b/libbb/bb_strtod.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" #include /* just for HUGE_VAL */ diff --git a/libbb/bb_strtonum.c b/libbb/bb_strtonum.c index 949f26bee..2185017b0 100644 --- a/libbb/bb_strtonum.c +++ b/libbb/bb_strtonum.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* On exit: errno = 0 only if there was non-empty, '\0' terminated value diff --git a/libbb/bbunit.c b/libbb/bbunit.c index db67b1081..5f8d980a3 100644 --- a/libbb/bbunit.c +++ b/libbb/bbunit.c @@ -6,9 +6,9 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//applet:IF_UNIT_TEST(APPLET(unit, BB_DIR_USR_BIN, BB_SUID_DROP)) //kbuild:lib-$(CONFIG_UNIT_TEST) += bbunit.o -//applet:IF_UNIT_TEST(APPLET(unit, BB_DIR_USR_BIN, BB_SUID_DROP)) //usage:#define unit_trivial_usage //usage: "" diff --git a/libbb/change_identity.c b/libbb/change_identity.c index 431f72c8c..20d7c5f2d 100644 --- a/libbb/change_identity.c +++ b/libbb/change_identity.c @@ -27,7 +27,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include "libbb.h" /* Become the user and group(s) specified by PW. */ diff --git a/libbb/chomp.c b/libbb/chomp.c index cb92befb1..3757bff2e 100644 --- a/libbb/chomp.c +++ b/libbb/chomp.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" void FAST_FUNC chomp(char *s) diff --git a/libbb/compare_string_array.c b/libbb/compare_string_array.c index 2f51237a3..01a9df0e2 100644 --- a/libbb/compare_string_array.c +++ b/libbb/compare_string_array.c @@ -2,7 +2,6 @@ /* * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c index 9ed295996..5b4b7f113 100644 --- a/libbb/concat_path_file.c +++ b/libbb/concat_path_file.c @@ -7,6 +7,7 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +#include "libbb.h" /* Concatenate path and filename to new allocated buffer. * Add '/' only as needed (no duplicate // are produced). @@ -14,8 +15,6 @@ * filename should not be NULL. */ -#include "libbb.h" - char* FAST_FUNC concat_path_file(const char *path, const char *filename) { char *lc; diff --git a/libbb/concat_subpath_file.c b/libbb/concat_subpath_file.c index c9167d492..bc2ee96ca 100644 --- a/libbb/concat_subpath_file.c +++ b/libbb/concat_subpath_file.c @@ -6,6 +6,7 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +#include "libbb.h" /* This function make special for recursive actions with usage @@ -13,8 +14,6 @@ and skipping "." and ".." directory entries */ -#include "libbb.h" - char* FAST_FUNC concat_subpath_file(const char *path, const char *f) { if (f && DOT_OR_DOTDOT(f)) diff --git a/libbb/copyfd.c b/libbb/copyfd.c index 921fe3f81..dd0517cd6 100644 --- a/libbb/copyfd.c +++ b/libbb/copyfd.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" #if ENABLE_FEATURE_USE_SENDFILE # include diff --git a/libbb/correct_password.c b/libbb/correct_password.c index 51928f68d..a6f7d9b3d 100644 --- a/libbb/correct_password.c +++ b/libbb/correct_password.c @@ -27,7 +27,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include "libbb.h" #define SHADOW_BUFSIZE 256 diff --git a/libbb/crc32.c b/libbb/crc32.c index 0711ca84e..b00b580d0 100644 --- a/libbb/crc32.c +++ b/libbb/crc32.c @@ -15,7 +15,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" uint32_t *global_crc32_table; diff --git a/libbb/default_error_retval.c b/libbb/default_error_retval.c index 4f6395fa2..fc6a5364a 100644 --- a/libbb/default_error_retval.c +++ b/libbb/default_error_retval.c @@ -4,7 +4,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - /* Seems silly to copyright a global variable. ;-) Oh well. * * At least one applet (cmp) returns a value different from the typical @@ -12,7 +11,6 @@ * by the applet. I suppose we could use a wrapper function to set it, but * that too seems silly. */ - #include "libbb.h" uint8_t xfunc_error_retval = EXIT_FAILURE; diff --git a/libbb/device_open.c b/libbb/device_open.c index a8fe2fcb4..e5639c712 100644 --- a/libbb/device_open.c +++ b/libbb/device_open.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* try to open up the specified device */ diff --git a/libbb/die_if_bad_username.c b/libbb/die_if_bad_username.c index cf1297bd6..46f103340 100644 --- a/libbb/die_if_bad_username.c +++ b/libbb/die_if_bad_username.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* To avoid problems, the username should consist only of diff --git a/libbb/dump.c b/libbb/dump.c index e23b71294..db91fcfe7 100644 --- a/libbb/dump.c +++ b/libbb/dump.c @@ -10,7 +10,6 @@ * * Original copyright notice is retained at the end of this file. */ - #include "libbb.h" #include "dump.h" diff --git a/libbb/executable.c b/libbb/executable.c index 3a1d4ff44..325dd0107 100644 --- a/libbb/executable.c +++ b/libbb/executable.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* check if path points to an executable file; diff --git a/libbb/fclose_nonstdin.c b/libbb/fclose_nonstdin.c index 1b1441347..7d5331063 100644 --- a/libbb/fclose_nonstdin.c +++ b/libbb/fclose_nonstdin.c @@ -6,14 +6,12 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +#include "libbb.h" /* A number of standard utilities can accept multiple command line args * of '-' for stdin, according to SUSv3. So we encapsulate the check * here to save a little space. */ - -#include "libbb.h" - int FAST_FUNC fclose_if_not_stdin(FILE *f) { /* Some more paranoid applets want ferror() check too */ diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c index b4bed865f..4c689c0fb 100644 --- a/libbb/fflush_stdout_and_exit.c +++ b/libbb/fflush_stdout_and_exit.c @@ -6,13 +6,11 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +#include "libbb.h" /* Attempt to fflush(stdout), and exit with an error code if stdout is * in an error state. */ - -#include "libbb.h" - void FAST_FUNC fflush_stdout_and_exit(int retval) { xfunc_error_retval = retval; diff --git a/libbb/fgets_str.c b/libbb/fgets_str.c index 89210a3c9..1a7f2e9e0 100644 --- a/libbb/fgets_str.c +++ b/libbb/fgets_str.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, int chop_off, size_t *maxsz_p) diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c index 9676b5f52..94bbf1d4a 100644 --- a/libbb/find_mount_point.c +++ b/libbb/find_mount_point.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" #include diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c index db823d05b..abbf293e8 100644 --- a/libbb/find_pid_by_name.c +++ b/libbb/find_pid_by_name.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* diff --git a/libbb/find_root_device.c b/libbb/find_root_device.c index 8436cd664..d560f3ec3 100644 --- a/libbb/find_root_device.c +++ b/libbb/find_root_device.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* Find block device /dev/XXX which contains specified file diff --git a/libbb/full_write.c b/libbb/full_write.c index 777fbd910..2b7983f4c 100644 --- a/libbb/full_write.c +++ b/libbb/full_write.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* diff --git a/libbb/get_console.c b/libbb/get_console.c index 96b339ca7..0b53524aa 100644 --- a/libbb/get_console.c +++ b/libbb/get_console.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* From */ diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index a98dd35eb..cc61a9265 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c @@ -8,7 +8,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end) diff --git a/libbb/getpty.c b/libbb/getpty.c index 391d729f2..5d24ca930 100644 --- a/libbb/getpty.c +++ b/libbb/getpty.c @@ -5,7 +5,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" #define DEBUG 0 diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c index 2a7247430..a53a382ce 100644 --- a/libbb/hash_md5_sha.c +++ b/libbb/hash_md5_sha.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" #define NEED_SHA512 (ENABLE_SHA512SUM || ENABLE_USE_BB_CRYPT_SHA) diff --git a/libbb/human_readable.c b/libbb/human_readable.c index b4e0ef181..09221a186 100644 --- a/libbb/human_readable.c +++ b/libbb/human_readable.c @@ -22,7 +22,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" const char* FAST_FUNC make_human_readable_str(unsigned long long val, diff --git a/libbb/in_ether.c b/libbb/in_ether.c index 161c8ea3c..c9cf6a99b 100644 --- a/libbb/in_ether.c +++ b/libbb/in_ether.c @@ -2,7 +2,6 @@ /* * Utility routines. */ - //kbuild:lib-$(CONFIG_ARP) += in_ether.o //kbuild:lib-$(CONFIG_IFCONFIG) += in_ether.o //kbuild:lib-$(CONFIG_IFENSLAVE) += in_ether.o diff --git a/libbb/inet_common.c b/libbb/inet_common.c index 04259f47b..e9fbde7dc 100644 --- a/libbb/inet_common.c +++ b/libbb/inet_common.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" #include "inet_common.h" diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c index f11c2afb2..4142813e3 100644 --- a/libbb/inode_hash.c +++ b/libbb/inode_hash.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" typedef struct ino_dev_hash_bucket_struct { diff --git a/libbb/isdirectory.c b/libbb/isdirectory.c index ba6c52ce8..462aa0067 100644 --- a/libbb/isdirectory.c +++ b/libbb/isdirectory.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include #include "libbb.h" diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c index 9b6c62299..7769a091b 100644 --- a/libbb/kernel_version.c +++ b/libbb/kernel_version.c @@ -6,12 +6,10 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* After libbb.h, since it needs sys/types.h on some systems */ #include /* for uname(2) */ - /* Returns current kernel version encoded as major*65536 + minor*256 + patch, * so, for example, to check if the kernel is greater than 2.2.11: * diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c index 65e6cdf04..66f2e3635 100644 --- a/libbb/last_char_is.c +++ b/libbb/last_char_is.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* Find out if the last character of a string matches the one given. diff --git a/libbb/llist.c b/libbb/llist.c index 032e9fac8..e964a9b72 100644 --- a/libbb/llist.c +++ b/libbb/llist.c @@ -9,7 +9,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* Add data to the start of the linked list. */ diff --git a/libbb/login.c b/libbb/login.c index 5a7acfcf0..7f593d80d 100644 --- a/libbb/login.c +++ b/libbb/login.c @@ -8,7 +8,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* After libbb.h, since it needs sys/types.h on some systems */ #include diff --git a/libbb/make_directory.c b/libbb/make_directory.c index a6b7c28df..b9916d165 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - /* Mar 5, 2003 Manuel Novoa III * * This is the main work function for the 'mkdir' applet. As such, it @@ -21,7 +20,6 @@ * To set specific permissions on 'path', pass the appropriate 'mode' * val. Otherwise, pass -1 to get default permissions. */ - #include "libbb.h" /* This function is used from NOFORK applets. It must not allocate anything */ diff --git a/libbb/match_fstype.c b/libbb/match_fstype.c index 6046bc6db..1e2269c5e 100644 --- a/libbb/match_fstype.c +++ b/libbb/match_fstype.c @@ -9,7 +9,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" int FAST_FUNC fstype_matches(const char *fstype, const char *comma_list) diff --git a/libbb/messages.c b/libbb/messages.c index 27fd14ecc..0a6cf3bf8 100644 --- a/libbb/messages.c +++ b/libbb/messages.c @@ -4,7 +4,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* allow default system PATH to be extended via CFLAGS */ diff --git a/libbb/mode_string.c b/libbb/mode_string.c index 934eb6dc7..280e6d291 100644 --- a/libbb/mode_string.c +++ b/libbb/mode_string.c @@ -10,8 +10,6 @@ /* Aug 13, 2003 * Fix a bug reported by junkio@cox.net involving the mode_chars index. */ - - #include #include diff --git a/libbb/mtab.c b/libbb/mtab.c index 22bff6490..131705ddb 100644 --- a/libbb/mtab.c +++ b/libbb/mtab.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include #include "libbb.h" diff --git a/libbb/nuke_str.c b/libbb/nuke_str.c index 56b808bc7..240e68004 100644 --- a/libbb/nuke_str.c +++ b/libbb/nuke_str.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - //kbuild:lib-y += nuke_str.o #include "libbb.h" diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c index bddd39bca..dc65860f6 100644 --- a/libbb/parse_mode.c +++ b/libbb/parse_mode.c @@ -6,11 +6,10 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +#include "libbb.h" /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */ -#include "libbb.h" - /* This function is used from NOFORK applets. It must not allocate anything */ #define FILEMODEBITS (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) diff --git a/libbb/percent_decode.c b/libbb/percent_decode.c index 9a9d80c4a..e5e42f0b5 100644 --- a/libbb/percent_decode.c +++ b/libbb/percent_decode.c @@ -2,7 +2,6 @@ /* * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - //kbuild:lib-y += percent_decode.o #include "libbb.h" diff --git a/libbb/printable.c b/libbb/printable.c index 9a423431e..224dde406 100644 --- a/libbb/printable.c +++ b/libbb/printable.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" void FAST_FUNC fputc_printable(int ch, FILE *file) diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c index 346ecfa1e..59d0d3ea8 100644 --- a/libbb/process_escape_sequence.c +++ b/libbb/process_escape_sequence.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" #define WANT_HEX_ESCAPES 1 diff --git a/libbb/procps.c b/libbb/procps.c index b52c0f51b..9d8a921df 100644 --- a/libbb/procps.c +++ b/libbb/procps.c @@ -8,7 +8,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" diff --git a/libbb/ptr_to_globals.c b/libbb/ptr_to_globals.c index 1074538f3..8ba9cd154 100644 --- a/libbb/ptr_to_globals.c +++ b/libbb/ptr_to_globals.c @@ -4,7 +4,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include struct globals; diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c index fe06a8fe6..1edf4b6f0 100644 --- a/libbb/pw_encrypt.c +++ b/libbb/pw_encrypt.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* static const uint8_t ascii64[] ALIGN1 = diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 8f2b8b932..0831ecc3a 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" #undef DEBUG_RECURS_ACTION diff --git a/libbb/remove_file.c b/libbb/remove_file.c index eaca293d9..8a1324393 100644 --- a/libbb/remove_file.c +++ b/libbb/remove_file.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* Used from NOFORK applets. Must not allocate anything */ diff --git a/libbb/replace.c b/libbb/replace.c index 8711f957d..a661d96e6 100644 --- a/libbb/replace.c +++ b/libbb/replace.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - //kbuild:lib-y += replace.o #include "libbb.h" diff --git a/libbb/run_shell.c b/libbb/run_shell.c index 3bb58bb6f..a0420d982 100644 --- a/libbb/run_shell.c +++ b/libbb/run_shell.c @@ -27,7 +27,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include "libbb.h" #if ENABLE_SELINUX #include /* for setexeccon */ diff --git a/libbb/safe_gethostname.c b/libbb/safe_gethostname.c index cac99ae03..b22e30ea3 100644 --- a/libbb/safe_gethostname.c +++ b/libbb/safe_gethostname.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - /* * SUSv2 guarantees that "Host names are limited to 255 bytes" * POSIX.1-2001 guarantees that "Host names (not including the terminating @@ -23,7 +22,6 @@ * Host software MUST handle host names of up to 63 characters and * SHOULD handle host names of up to 255 characters. */ - #include "libbb.h" #include diff --git a/libbb/safe_poll.c b/libbb/safe_poll.c index b492a8151..cf93a9774 100644 --- a/libbb/safe_poll.c +++ b/libbb/safe_poll.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" /* Wrapper which restarts poll on EINTR or ENOMEM. diff --git a/libbb/safe_strncpy.c b/libbb/safe_strncpy.c index 5eb0db0bd..9570aacd7 100644 --- a/libbb/safe_strncpy.c +++ b/libbb/safe_strncpy.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* Like strncpy but make sure the resulting string is always 0 terminated. */ diff --git a/libbb/safe_write.c b/libbb/safe_write.c index aad50f5e0..12bb438b7 100644 --- a/libbb/safe_write.c +++ b/libbb/safe_write.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" ssize_t FAST_FUNC safe_write(int fd, const void *buf, size_t count) diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c index 91b6d94db..f8de44967 100644 --- a/libbb/setup_environment.c +++ b/libbb/setup_environment.c @@ -27,7 +27,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include "libbb.h" void FAST_FUNC setup_environment(const char *shell, int flags, const struct passwd *pw) diff --git a/libbb/signals.c b/libbb/signals.c index 56512473a..3f589321c 100644 --- a/libbb/signals.c +++ b/libbb/signals.c @@ -8,7 +8,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" /* All known arches use small ints for signals */ diff --git a/libbb/skip_whitespace.c b/libbb/skip_whitespace.c index b6cfbba4d..4df5d9e4d 100644 --- a/libbb/skip_whitespace.c +++ b/libbb/skip_whitespace.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" char* FAST_FUNC skip_whitespace(const char *s) diff --git a/libbb/speed_table.c b/libbb/speed_table.c index 11ced01d0..967cf8de8 100644 --- a/libbb/speed_table.c +++ b/libbb/speed_table.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" struct speed_map { diff --git a/libbb/strrstr.c b/libbb/strrstr.c index 93d970a1b..a173b034f 100644 --- a/libbb/strrstr.c +++ b/libbb/strrstr.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* diff --git a/libbb/trim.c b/libbb/trim.c index e47fec74e..e360ba138 100644 --- a/libbb/trim.c +++ b/libbb/trim.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" char* FAST_FUNC trim(char *s) diff --git a/libbb/uuencode.c b/libbb/uuencode.c index f7b248492..f32a3da7d 100644 --- a/libbb/uuencode.c +++ b/libbb/uuencode.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* Conversion table. for base 64 */ diff --git a/libbb/wfopen.c b/libbb/wfopen.c index 76dc8b82a..20fe18b23 100644 --- a/libbb/wfopen.c +++ b/libbb/wfopen.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" FILE* FAST_FUNC fopen_or_warn(const char *path, const char *mode) diff --git a/libbb/wfopen_input.c b/libbb/wfopen_input.c index d8b1c4a36..872464248 100644 --- a/libbb/wfopen_input.c +++ b/libbb/wfopen_input.c @@ -6,14 +6,13 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +#include "libbb.h" /* A number of applets need to open a file for reading, where the filename * is a command line arg. Since often that arg is '-' (meaning stdin), * we avoid testing everywhere by consolidating things in this routine. */ -#include "libbb.h" - FILE* FAST_FUNC fopen_or_warn_stdin(const char *filename) { FILE *fp = stdin; diff --git a/libbb/write.c b/libbb/write.c index 2d67a7281..dd64b0032 100644 --- a/libbb/write.c +++ b/libbb/write.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" /* Open file and write string str to it, close file. diff --git a/libbb/xatonum.c b/libbb/xatonum.c index b63b7f54d..7639a62aa 100644 --- a/libbb/xatonum.c +++ b/libbb/xatonum.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" #define type long long diff --git a/libbb/xconnect.c b/libbb/xconnect.c index 3a0dc2653..39e56b223 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include #include /* netinet/in.h needs it */ #include diff --git a/libbb/xfunc_die.c b/libbb/xfunc_die.c index 73f7998e5..25b99066d 100644 --- a/libbb/xfunc_die.c +++ b/libbb/xfunc_die.c @@ -6,12 +6,11 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ +#include "libbb.h" /* Keeping it separate allows to NOT pull in stdio for VERY small applets. * Try building busybox with only "true" enabled... */ -#include "libbb.h" - void (*die_func)(void); void FAST_FUNC xfunc_die(void) diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 0dfb3e2d9..9cbfb2836 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -8,7 +8,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - /* We need to have separate xfuncs.c and xfuncs_printf.c because * with current linkers, even with section garbage collection, * if *.o module references any of XXXprintf functions, you pull in @@ -21,7 +20,6 @@ * * TODO: move xmalloc() and xatonum() here. */ - #include "libbb.h" /* Turn on nonblocking I/O on a fd */ diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index f569b0263..2bc01ad10 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c @@ -8,7 +8,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - /* We need to have separate xfuncs.c and xfuncs_printf.c because * with current linkers, even with section garbage collection, * if *.o module references any of XXXprintf functions, you pull in @@ -19,7 +18,6 @@ * which do not pull in printf, directly or indirectly. * xfunc_printf.c contains those which do. */ - #include "libbb.h" diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c index 71720d323..7f9088bda 100644 --- a/libbb/xgetcwd.c +++ b/libbb/xgetcwd.c @@ -8,7 +8,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" /* Return the current directory, newly allocated, arbitrarily long. diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c index 7d4cb60a5..9b62bcc43 100644 --- a/libbb/xreadlink.c +++ b/libbb/xreadlink.c @@ -5,7 +5,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" /* Some systems (eg Hurd) do not have MAXSYMLINKS definition, diff --git a/libbb/xrealloc_vector.c b/libbb/xrealloc_vector.c index e8d31b7e4..dda5f3f7d 100644 --- a/libbb/xrealloc_vector.c +++ b/libbb/xrealloc_vector.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ - #include "libbb.h" /* Resize (grow) malloced vector. diff --git a/libbb/xregcomp.c b/libbb/xregcomp.c index 344028f44..5870012d0 100644 --- a/libbb/xregcomp.c +++ b/libbb/xregcomp.c @@ -7,7 +7,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ - #include "libbb.h" #include "xregex.h" -- cgit v1.2.3