aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-02-03 00:05:48 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2011-02-03 00:05:48 +0100
commitb7c9fb27cba3d697e602f8cbf88cde135d8d6c5e (patch)
treeb30b48c8a78e0ee4ed639a398e8778e5e3f50a04
parent6307357effb79c8fbc6ccc9d4528c8c1c48a4831 (diff)
downloadbusybox-w32-b7c9fb27cba3d697e602f8cbf88cde135d8d6c5e.tar.gz
busybox-w32-b7c9fb27cba3d697e602f8cbf88cde135d8d6c5e.tar.bz2
busybox-w32-b7c9fb27cba3d697e602f8cbf88cde135d8d6c5e.zip
whitespace fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--applets/usage_pod.c4
-rw-r--r--archival/lzop.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c4
-rw-r--r--editors/sed.c2
-rw-r--r--libbb/crc32.c2
-rw-r--r--libbb/getopt32.c8
-rw-r--r--loginutils/getty.c2
-rw-r--r--modutils/modprobe.c2
-rw-r--r--networking/httpd_ssi.c4
-rw-r--r--networking/ntpd.c2
-rw-r--r--procps/pstree.c2
-rw-r--r--shell/shell_common.c6
-rw-r--r--util-linux/flock.c2
13 files changed, 21 insertions, 21 deletions
diff --git a/applets/usage_pod.c b/applets/usage_pod.c
index da0baefc6..0b1c4aadb 100644
--- a/applets/usage_pod.c
+++ b/applets/usage_pod.c
@@ -31,8 +31,8 @@
31#include "usage.h" 31#include "usage.h"
32#define MAKE_USAGE(aname, usage) { aname, usage }, 32#define MAKE_USAGE(aname, usage) { aname, usage },
33static struct usage_data { 33static struct usage_data {
34 const char *aname; 34 const char *aname;
35 const char *usage; 35 const char *usage;
36} usage_array[] = { 36} usage_array[] = {
37#include "applets.h" 37#include "applets.h"
38}; 38};
diff --git a/archival/lzop.c b/archival/lzop.c
index 094e78cf9..62455c313 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -401,7 +401,7 @@ struct globals {
401#define INIT_G() do { } while (0) 401#define INIT_G() do { } while (0)
402//#define G (*ptr_to_globals) 402//#define G (*ptr_to_globals)
403//#define INIT_G() do { 403//#define INIT_G() do {
404// SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); 404// SET_PTR_TO_GLOBALS(xzalloc(sizeof(G)));
405//} while (0) 405//} while (0)
406 406
407 407
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c
index b9aab440a..7d37d232d 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c
@@ -155,8 +155,8 @@ int ext2fs_group_of_ino(ext2_filsys fs, ext2_ino_t ino)
155blk_t ext2fs_inode_data_blocks(ext2_filsys fs, 155blk_t ext2fs_inode_data_blocks(ext2_filsys fs,
156 struct ext2_inode *inode) 156 struct ext2_inode *inode)
157{ 157{
158 return inode->i_blocks - 158 return inode->i_blocks -
159 (inode->i_file_acl ? fs->blocksize >> 9 : 0); 159 (inode->i_file_acl ? fs->blocksize >> 9 : 0);
160} 160}
161 161
162 162
diff --git a/editors/sed.c b/editors/sed.c
index b91acfb7f..d3555243f 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -124,7 +124,7 @@ struct globals {
124} FIX_ALIASING; 124} FIX_ALIASING;
125#define G (*(struct globals*)&bb_common_bufsiz1) 125#define G (*(struct globals*)&bb_common_bufsiz1)
126struct BUG_G_too_big { 126struct BUG_G_too_big {
127 char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; 127 char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
128}; 128};
129#define INIT_G() do { \ 129#define INIT_G() do { \
130 G.sed_cmd_tail = &G.sed_cmd_head; \ 130 G.sed_cmd_tail = &G.sed_cmd_head; \
diff --git a/libbb/crc32.c b/libbb/crc32.c
index c63bf0772..ac9836cc9 100644
--- a/libbb/crc32.c
+++ b/libbb/crc32.c
@@ -59,7 +59,7 @@ uint32_t FAST_FUNC crc32_block_endian0(uint32_t val, const void *buf, unsigned l
59 const void *end = (uint8_t*)buf + len; 59 const void *end = (uint8_t*)buf + len;
60 60
61 while (buf != end) { 61 while (buf != end) {
62 val = crc_table[(uint8_t)val ^ *(uint8_t*)buf] ^ (val >> 8); 62 val = crc_table[(uint8_t)val ^ *(uint8_t*)buf] ^ (val >> 8);
63 buf = (uint8_t*)buf + 1; 63 buf = (uint8_t*)buf + 1;
64 } 64 }
65 return val; 65 return val;
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index abd412043..f3f1cfcba 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -80,9 +80,9 @@ const char *applet_long_options
80 This struct allows you to define long options: 80 This struct allows you to define long options:
81 81
82 static const char applet_longopts[] ALIGN1 = 82 static const char applet_longopts[] ALIGN1 =
83 //"name\0" has_arg val 83 //"name\0" has_arg val
84 "verbose\0" No_argument "v" 84 "verbose\0" No_argument "v"
85 ; 85 ;
86 applet_long_options = applet_longopts; 86 applet_long_options = applet_longopts;
87 87
88 The last member of struct option (val) typically is set to 88 The last member of struct option (val) typically is set to
@@ -226,7 +226,7 @@ Special characters:
226 if specified together. In this case you must set 226 if specified together. In this case you must set
227 opt_complementary = "b--cf:c--bf:f--bc". If two of the 227 opt_complementary = "b--cf:c--bf:f--bc". If two of the
228 mutually exclusive options are found, getopt32 will call 228 mutually exclusive options are found, getopt32 will call
229 bb_show_usage() and die. 229 bb_show_usage() and die.
230 230
231 "x--x" Variation of the above, it means that -x option should occur 231 "x--x" Variation of the above, it means that -x option should occur
232 at most once. 232 at most once.
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 34f72c465..3f20c8e81 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -334,7 +334,7 @@ static void termios_final(void)
334 * IMAXBEL Echo BEL on input line too long 334 * IMAXBEL Echo BEL on input line too long
335 * IUTF8 Appears to affect tty's idea of char widths, 335 * IUTF8 Appears to affect tty's idea of char widths,
336 * observed to improve backspacing through Unicode chars 336 * observed to improve backspacing through Unicode chars
337 */ 337 */
338 338
339 /* line buffered input (NL or EOL or EOF chars end a line); 339 /* line buffered input (NL or EOL or EOF chars end a line);
340 * recognize INT/QUIT/SUSP chars; 340 * recognize INT/QUIT/SUSP chars;
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 8d2ccc562..0d28da7ea 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -170,7 +170,7 @@ struct globals {
170#define G (*(struct globals*)&bb_common_bufsiz1) 170#define G (*(struct globals*)&bb_common_bufsiz1)
171#define INIT_G() do { } while (0) 171#define INIT_G() do { } while (0)
172struct BUG_G_too_big { 172struct BUG_G_too_big {
173 char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1]; 173 char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
174}; 174};
175 175
176 176
diff --git a/networking/httpd_ssi.c b/networking/httpd_ssi.c
index 87f43fcfa..cfe64eb46 100644
--- a/networking/httpd_ssi.c
+++ b/networking/httpd_ssi.c
@@ -52,9 +52,9 @@ httpd_ssi.c -o httpd_ssi
52 52
53static char* skip_whitespace(char *s) 53static char* skip_whitespace(char *s)
54{ 54{
55 while (*s == ' ' || *s == '\t') ++s; 55 while (*s == ' ' || *s == '\t') ++s;
56 56
57 return s; 57 return s;
58} 58}
59 59
60static char line[64 * 1024]; 60static char line[64 * 1024];
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 8fe529edb..3ed05ba29 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -882,7 +882,7 @@ fit(peer_t *p, double rd)
882// /* Do we have a loop? */ 882// /* Do we have a loop? */
883// if (p->refid == p->dstaddr || p->refid == s.refid) 883// if (p->refid == p->dstaddr || p->refid == s.refid)
884// return 0; 884// return 0;
885 return 1; 885 return 1;
886} 886}
887static peer_t* 887static peer_t*
888select_and_cluster(void) 888select_and_cluster(void)
diff --git a/procps/pstree.c b/procps/pstree.c
index ddf5dba59..4cd8cb458 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -76,7 +76,7 @@ struct globals {
76}; 76};
77#define G (*ptr_to_globals) 77#define G (*ptr_to_globals)
78#define INIT_G() do { \ 78#define INIT_G() do { \
79 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ 79 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
80} while (0) 80} while (0)
81 81
82 82
diff --git a/shell/shell_common.c b/shell/shell_common.c
index e9effd2d0..f02ed81ea 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -368,9 +368,9 @@ shell_builtin_ulimit(char **argv)
368#endif 368#endif
369 /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */ 369 /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
370 370
371 argc = 1; 371 argc = 1;
372 while (argv[argc]) 372 while (argv[argc])
373 argc++; 373 argc++;
374 374
375 opts = 0; 375 opts = 0;
376 while (1) { 376 while (1) {
diff --git a/util-linux/flock.c b/util-linux/flock.c
index be3d552fa..77fe1f809 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -19,7 +19,7 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
19 }; 19 };
20 20
21#if ENABLE_LONG_OPTS 21#if ENABLE_LONG_OPTS
22 static const char getopt_longopts[] ALIGN1 = 22 static const char getopt_longopts[] ALIGN1 =
23 "shared\0" No_argument "s" 23 "shared\0" No_argument "s"
24 "exclusive\0" No_argument "x" 24 "exclusive\0" No_argument "x"
25 "unlock\0" No_argument "u" 25 "unlock\0" No_argument "u"