diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-07-30 11:52:58 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-07-30 11:52:58 +0200 |
commit | 982e87f2fb45bf8a951774b3c6dab7afb0dc89f8 (patch) | |
tree | f3c90eaa6dba03d209b9f05c799c3ded447cad22 | |
parent | bfa6ed1bf43ea607e33a6e89a0ef03f84a5b5d38 (diff) | |
download | busybox-w32-982e87f2fb45bf8a951774b3c6dab7afb0dc89f8.tar.gz busybox-w32-982e87f2fb45bf8a951774b3c6dab7afb0dc89f8.tar.bz2 busybox-w32-982e87f2fb45bf8a951774b3c6dab7afb0dc89f8.zip |
Whitespace fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | coreutils/catv.c | 2 | ||||
-rw-r--r-- | docs/tcp.txt | 2 | ||||
-rw-r--r-- | findutils/find.c | 4 | ||||
-rw-r--r-- | include/bb_e2fs_defs.h | 2 | ||||
-rw-r--r-- | include/libbb.h | 6 | ||||
-rw-r--r-- | include/liblzo_interface.h | 2 | ||||
-rw-r--r-- | libbb/appletlib.c | 2 | ||||
-rw-r--r-- | modutils/modprobe.c | 2 | ||||
-rw-r--r-- | networking/httpd.c | 4 | ||||
-rw-r--r-- | networking/ntpd.c | 4 | ||||
-rw-r--r-- | networking/tc.c | 2 | ||||
-rw-r--r-- | 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) | |||
29 | #define CATV_OPT_e (1<<0) | 29 | #define CATV_OPT_e (1<<0) |
30 | #define CATV_OPT_t (1<<1) | 30 | #define CATV_OPT_t (1<<1) |
31 | #define CATV_OPT_v (1<<2) | 31 | #define CATV_OPT_v (1<<2) |
32 | typedef char BUG_const_mismatch[ | 32 | typedef char BUG_const_mismatch[ |
33 | CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS | 33 | CATV_OPT_e == VISIBLE_ENDLINE && CATV_OPT_t == VISIBLE_SHOW_TABS |
34 | ? 1 : -1 | 34 | ? 1 : -1 |
35 | ]; | 35 | ]; |
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: | |||
31 | */ | 31 | */ |
32 | struct linger { | 32 | struct linger { |
33 | int l_onoff; /* linger active */ | 33 | int l_onoff; /* linger active */ |
34 | int l_linger; /* how many seconds to linger for */ | 34 | int l_linger; /* how many seconds to linger for */ |
35 | } linger; | 35 | } linger; |
36 | linger.l_onoff = 1; | 36 | linger.l_onoff = 1; |
37 | linger.l_linger = SOME_NUM; | 37 | 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) | |||
985 | */ | 985 | */ |
986 | /* Options */ | 986 | /* Options */ |
987 | if (parm == OPT_FOLLOW) { | 987 | if (parm == OPT_FOLLOW) { |
988 | dbg("follow enabled: %d", __LINE__); | 988 | dbg("follow enabled: %d", __LINE__); |
989 | G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK; | 989 | G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK; |
990 | } | 990 | } |
991 | #if ENABLE_FEATURE_FIND_XDEV | 991 | #if ENABLE_FEATURE_FIND_XDEV |
992 | else if (parm == OPT_XDEV) { | 992 | 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 { | |||
442 | uint32_t s_reserved[162]; /* Padding to the end of the block */ | 442 | uint32_t s_reserved[162]; /* Padding to the end of the block */ |
443 | }; | 443 | }; |
444 | struct BUG_ext2_super_block { | 444 | struct BUG_ext2_super_block { |
445 | char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1]; | 445 | char bug[sizeof(struct ext2_super_block) == 1024 ? 1 : -1]; |
446 | }; | 446 | }; |
447 | 447 | ||
448 | /* | 448 | /* |
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; | |||
483 | off_t fdlength(int fd) FAST_FUNC; | 483 | off_t fdlength(int fd) FAST_FUNC; |
484 | 484 | ||
485 | uoff_t FAST_FUNC get_volume_size_in_bytes(int fd, | 485 | uoff_t FAST_FUNC get_volume_size_in_bytes(int fd, |
486 | const char *override, | 486 | const char *override, |
487 | unsigned override_units, | 487 | unsigned override_units, |
488 | int extend); | 488 | int extend); |
489 | 489 | ||
490 | void xpipe(int filedes[2]) FAST_FUNC; | 490 | void xpipe(int filedes[2]) FAST_FUNC; |
491 | /* In this form code with pipes is much more readable */ | 491 | /* 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 @@ | |||
30 | /* | 30 | /* |
31 | static void die_at(int line) | 31 | static void die_at(int line) |
32 | { | 32 | { |
33 | bb_error_msg_and_die("internal error at %d", line); | 33 | bb_error_msg_and_die("internal error at %d", line); |
34 | } | 34 | } |
35 | #define assert(v) if (!(v)) die_at(__LINE__) | 35 | #define assert(v) if (!(v)) die_at(__LINE__) |
36 | */ | 36 | */ |
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 @@ | |||
29 | #include "busybox.h" | 29 | #include "busybox.h" |
30 | 30 | ||
31 | #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ | 31 | #if !(defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) \ |
32 | || defined(__APPLE__) \ | 32 | || defined(__APPLE__) \ |
33 | ) | 33 | ) |
34 | # include <malloc.h> /* for mallopt */ | 34 | # include <malloc.h> /* for mallopt */ |
35 | #endif | 35 | #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 { | |||
171 | } FIX_ALIASING; | 171 | } FIX_ALIASING; |
172 | #define G (*ptr_to_globals) | 172 | #define G (*ptr_to_globals) |
173 | #define INIT_G() do { \ | 173 | #define INIT_G() do { \ |
174 | SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ | 174 | SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ |
175 | } while (0) | 175 | } while (0) |
176 | 176 | ||
177 | 177 | ||
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, | |||
1709 | s = userinfo->pw; | 1709 | s = userinfo->pw; |
1710 | break; | 1710 | break; |
1711 | case PAM_ERROR_MSG: | 1711 | case PAM_ERROR_MSG: |
1712 | case PAM_TEXT_INFO: | 1712 | case PAM_TEXT_INFO: |
1713 | s = ""; | 1713 | s = ""; |
1714 | break; | 1714 | break; |
1715 | default: | 1715 | default: |
1716 | free(response); | 1716 | 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 { | |||
228 | uint8_t lastpkt_status; | 228 | uint8_t lastpkt_status; |
229 | uint8_t lastpkt_stratum; | 229 | uint8_t lastpkt_stratum; |
230 | uint8_t reachable_bits; | 230 | uint8_t reachable_bits; |
231 | /* when to send new query (if p_fd == -1) | 231 | /* when to send new query (if p_fd == -1) |
232 | * or when receive times out (if p_fd >= 0): */ | 232 | * or when receive times out (if p_fd >= 0): */ |
233 | double next_action_time; | 233 | double next_action_time; |
234 | double p_xmttime; | 234 | double p_xmttime; |
235 | double lastpkt_recv_time; | 235 | 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 { | |||
65 | } FIX_ALIASING; | 65 | } FIX_ALIASING; |
66 | #define G (*(struct globals*)&bb_common_bufsiz1) | 66 | #define G (*(struct globals*)&bb_common_bufsiz1) |
67 | struct BUG_G_too_big { | 67 | struct BUG_G_too_big { |
68 | char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; | 68 | char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; |
69 | }; | 69 | }; |
70 | #define filter_ifindex (G.filter_ifindex) | 70 | #define filter_ifindex (G.filter_ifindex) |
71 | #define filter_qdisc (G.filter_qdisc) | 71 | #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 { | |||
62 | const char *curfile; /* Name of current file being transferred */ | 62 | const char *curfile; /* Name of current file being transferred */ |
63 | bb_progress_t pmt; | 63 | bb_progress_t pmt; |
64 | #endif | 64 | #endif |
65 | char *dir_prefix; | 65 | char *dir_prefix; |
66 | #if ENABLE_FEATURE_WGET_LONG_OPTIONS | 66 | #if ENABLE_FEATURE_WGET_LONG_OPTIONS |
67 | char *post_data; | 67 | char *post_data; |
68 | char *extra_headers; | 68 | char *extra_headers; |
69 | #endif | 69 | #endif |
70 | char *fname_out; /* where to direct output (-O) */ | 70 | char *fname_out; /* where to direct output (-O) */ |
71 | const char *proxy_flag; /* Use proxies if env vars are set */ | 71 | const char *proxy_flag; /* Use proxies if env vars are set */ |
72 | const char *user_agent; /* "User-Agent" header field */ | 72 | const char *user_agent; /* "User-Agent" header field */ |
73 | #if ENABLE_FEATURE_WGET_TIMEOUT | 73 | #if ENABLE_FEATURE_WGET_TIMEOUT |
74 | unsigned timeout_seconds; | 74 | unsigned timeout_seconds; |
75 | #endif | 75 | #endif |
@@ -86,7 +86,7 @@ struct globals { | |||
86 | } FIX_ALIASING; | 86 | } FIX_ALIASING; |
87 | #define G (*ptr_to_globals) | 87 | #define G (*ptr_to_globals) |
88 | #define INIT_G() do { \ | 88 | #define INIT_G() do { \ |
89 | SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ | 89 | SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ |
90 | IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) \ | 90 | IF_FEATURE_WGET_TIMEOUT(G.timeout_seconds = 900;) \ |
91 | } while (0) | 91 | } while (0) |
92 | 92 | ||