From 982e87f2fb45bf8a951774b3c6dab7afb0dc89f8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 30 Jul 2013 11:52:58 +0200 Subject: [PATCH] Whitespace fixes Signed-off-by: Denys Vlasenko --- coreutils/catv.c | 2 +- docs/tcp.txt | 2 +- findutils/find.c | 4 ++-- include/bb_e2fs_defs.h | 2 +- include/libbb.h | 6 +++--- include/liblzo_interface.h | 2 +- libbb/appletlib.c | 2 +- modutils/modprobe.c | 2 +- networking/httpd.c | 4 ++-- networking/ntpd.c | 4 ++-- networking/tc.c | 2 +- networking/wget.c | 14 +++++++------- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/coreutils/catv.c b/coreutils/catv.c index 0139b397f..e3499c597 100644 --- a/coreutils/catv.c +++ b/coreutils/catv.c @@ -29,7 +29,7 @@ int catv_main(int argc UNUSED_PARAM, char **argv) #define CATV_OPT_e (1<<0) #define CATV_OPT_t (1<<1) #define CATV_OPT_v (1<<2) - typedef char BUG_const_mismatch[ + typedef char BUG_const_mismatch[ CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS ? 1 : -1 ]; diff --git a/docs/tcp.txt b/docs/tcp.txt index c867c6da9..766766387 100644 --- a/docs/tcp.txt +++ b/docs/tcp.txt @@ -31,7 +31,7 @@ Solution #1: block until sending is done: */ struct linger { int l_onoff; /* linger active */ - int l_linger; /* how many seconds to linger for */ + int l_linger; /* how many seconds to linger for */ } linger; linger.l_onoff = 1; linger.l_linger = SOME_NUM; diff --git a/findutils/find.c b/findutils/find.c index af913cc3c..53d8239c7 100644 --- a/findutils/find.c +++ b/findutils/find.c @@ -985,8 +985,8 @@ static action*** parse_params(char **argv) */ /* Options */ if (parm == OPT_FOLLOW) { - dbg("follow enabled: %d", __LINE__); - G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK; + dbg("follow enabled: %d", __LINE__); + G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK; } #if ENABLE_FEATURE_FIND_XDEV else if (parm == OPT_XDEV) { diff --git a/include/bb_e2fs_defs.h b/include/bb_e2fs_defs.h index b400f8c11..3f5e3c45b 100644 --- a/include/bb_e2fs_defs.h +++ b/include/bb_e2fs_defs.h @@ -442,7 +442,7 @@ struct ext2_super_block { uint32_t s_reserved[162]; /* Padding to the end of the block */ }; struct BUG_ext2_super_block { - char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1]; + char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1]; }; /* diff --git a/include/libbb.h b/include/libbb.h index 171214586..6b95dc0ec 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -483,9 +483,9 @@ int xmkstemp(char *template) FAST_FUNC; off_t fdlength(int fd) FAST_FUNC; uoff_t FAST_FUNC get_volume_size_in_bytes(int fd, - const char *override, - unsigned override_units, - int extend); + const char *override, + unsigned override_units, + int extend); void xpipe(int filedes[2]) FAST_FUNC; /* In this form code with pipes is much more readable */ diff --git a/include/liblzo_interface.h b/include/liblzo_interface.h index 9a84c0b6b..b7f1b639b 100644 --- a/include/liblzo_interface.h +++ b/include/liblzo_interface.h @@ -30,7 +30,7 @@ /* static void die_at(int line) { - bb_error_msg_and_die("internal error at %d", line); + bb_error_msg_and_die("internal error at %d", line); } #define assert(v) if (!(v)) die_at(__LINE__) */ diff --git a/libbb/appletlib.c b/libbb/appletlib.c index c22686e55..8f3a8a10b 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c @@ -29,7 +29,7 @@ #include "busybox.h" #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ - || defined(__APPLE__) \ + || defined(__APPLE__) \ ) # include /* for mallopt */ #endif diff --git a/modutils/modprobe.c b/modutils/modprobe.c index fb6c65990..7f7446d8e 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -171,7 +171,7 @@ struct globals { } FIX_ALIASING; #define G (*ptr_to_globals) #define INIT_G() do { \ - SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ + SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ } while (0) diff --git a/networking/httpd.c b/networking/httpd.c index b46eb0fab..cef9b8baf 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -1709,8 +1709,8 @@ static int pam_talker(int num_msg, s = userinfo->pw; break; case PAM_ERROR_MSG: - case PAM_TEXT_INFO: - s = ""; + case PAM_TEXT_INFO: + s = ""; break; default: free(response); diff --git a/networking/ntpd.c b/networking/ntpd.c index b04391eb5..99817e83b 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c @@ -228,8 +228,8 @@ typedef struct { uint8_t lastpkt_status; uint8_t lastpkt_stratum; uint8_t reachable_bits; - /* when to send new query (if p_fd == -1) - * or when receive times out (if p_fd >= 0): */ + /* when to send new query (if p_fd == -1) + * or when receive times out (if p_fd >= 0): */ double next_action_time; double p_xmttime; double lastpkt_recv_time; diff --git a/networking/tc.c b/networking/tc.c index f968707a9..b9a4d16cc 100644 --- a/networking/tc.c +++ b/networking/tc.c @@ -65,7 +65,7 @@ struct globals { } FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) struct BUG_G_too_big { - char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; + char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; }; #define filter_ifindex (G.filter_ifindex) #define filter_qdisc (G.filter_qdisc) diff --git a/networking/wget.c b/networking/wget.c index ce2f51411..5dac2b500 100644 --- a/networking/wget.c +++ b/networking/wget.c @@ -62,14 +62,14 @@ struct globals { const char *curfile; /* Name of current file being transferred */ bb_progress_t pmt; #endif - char *dir_prefix; + char *dir_prefix; #if ENABLE_FEATURE_WGET_LONG_OPTIONS - char *post_data; - char *extra_headers; + char *post_data; + char *extra_headers; #endif - char *fname_out; /* where to direct output (-O) */ - const char *proxy_flag; /* Use proxies if env vars are set */ - const char *user_agent; /* "User-Agent" header field */ + char *fname_out; /* where to direct output (-O) */ + const char *proxy_flag; /* Use proxies if env vars are set */ + const char *user_agent; /* "User-Agent" header field */ #if ENABLE_FEATURE_WGET_TIMEOUT unsigned timeout_seconds; #endif @@ -86,7 +86,7 @@ struct globals { } FIX_ALIASING; #define G (*ptr_to_globals) #define INIT_G() do { \ - SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ + SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) \ } while (0)