diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-29 11:46:52 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-29 11:46:52 +0200 |
commit | fb132e47370378474c68ad22c1c0cb2ccee178de (patch) | |
tree | 4f78d0fdd1c2fa2341c7d9bb17f9d98d099a238c /coreutils | |
parent | 66cb7bed33da605674c3d24734466b8e8a60e337 (diff) | |
download | busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.gz busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.tar.bz2 busybox-w32-fb132e47370378474c68ad22c1c0cb2ccee178de.zip |
whitespace cleanup
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/date.c | 2 | ||||
-rw-r--r-- | coreutils/dd.c | 2 | ||||
-rw-r--r-- | coreutils/mv.c | 2 | ||||
-rw-r--r-- | coreutils/nice.c | 6 | ||||
-rw-r--r-- | coreutils/od.c | 4 | ||||
-rw-r--r-- | coreutils/sort.c | 4 | ||||
-rw-r--r-- | coreutils/test.c | 6 | ||||
-rw-r--r-- | coreutils/tr.c | 8 | ||||
-rw-r--r-- | coreutils/wc.c | 6 |
9 files changed, 20 insertions, 20 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index 87cc8f2ef..a8040757d 100644 --- a/coreutils/date.c +++ b/coreutils/date.c | |||
@@ -278,7 +278,7 @@ int date_main(int argc UNUSED_PARAM, char **argv) | |||
278 | } | 278 | } |
279 | 279 | ||
280 | /* Correct any day of week and day of year etc. fields */ | 280 | /* Correct any day of week and day of year etc. fields */ |
281 | tm_time.tm_isdst = -1; /* Be sure to recheck dst */ | 281 | tm_time.tm_isdst = -1; /* Be sure to recheck dst */ |
282 | ts.tv_sec = validate_tm_time(date_str, &tm_time); | 282 | ts.tv_sec = validate_tm_time(date_str, &tm_time); |
283 | 283 | ||
284 | maybe_set_utc(opt); | 284 | maybe_set_utc(opt); |
diff --git a/coreutils/dd.c b/coreutils/dd.c index aa6f765ce..347a19454 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
@@ -24,7 +24,7 @@ static const struct suffix_mult dd_suffixes[] = { | |||
24 | { "b", 512 }, | 24 | { "b", 512 }, |
25 | { "kD", 1000 }, | 25 | { "kD", 1000 }, |
26 | { "k", 1024 }, | 26 | { "k", 1024 }, |
27 | { "K", 1024 }, /* compat with coreutils dd */ | 27 | { "K", 1024 }, /* compat with coreutils dd */ |
28 | { "MD", 1000000 }, | 28 | { "MD", 1000000 }, |
29 | { "M", 1048576 }, | 29 | { "M", 1048576 }, |
30 | { "GD", 1000000000 }, | 30 | { "GD", 1000000000 }, |
diff --git a/coreutils/mv.c b/coreutils/mv.c index 245639bd0..399f391b2 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c | |||
@@ -92,7 +92,7 @@ int mv_main(int argc, char **argv) | |||
92 | || (flags & OPT_FILEUTILS_INTERACTIVE)) | 92 | || (flags & OPT_FILEUTILS_INTERACTIVE)) |
93 | ) { | 93 | ) { |
94 | if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) { | 94 | if (fprintf(stderr, "mv: overwrite '%s'? ", dest) < 0) { |
95 | goto RET_1; /* Ouch! fprintf failed! */ | 95 | goto RET_1; /* Ouch! fprintf failed! */ |
96 | } | 96 | } |
97 | if (!bb_ask_confirmation()) { | 97 | if (!bb_ask_confirmation()) { |
98 | goto RET_0; | 98 | goto RET_0; |
diff --git a/coreutils/nice.c b/coreutils/nice.c index 6b8fce24d..35d6bf3d9 100644 --- a/coreutils/nice.c +++ b/coreutils/nice.c | |||
@@ -17,12 +17,12 @@ int nice_main(int argc, char **argv) | |||
17 | 17 | ||
18 | old_priority = getpriority(PRIO_PROCESS, 0); | 18 | old_priority = getpriority(PRIO_PROCESS, 0); |
19 | 19 | ||
20 | if (!*++argv) { /* No args, so (GNU) output current nice value. */ | 20 | if (!*++argv) { /* No args, so (GNU) output current nice value. */ |
21 | printf("%d\n", old_priority); | 21 | printf("%d\n", old_priority); |
22 | fflush_stdout_and_exit(EXIT_SUCCESS); | 22 | fflush_stdout_and_exit(EXIT_SUCCESS); |
23 | } | 23 | } |
24 | 24 | ||
25 | adjustment = 10; /* Set default adjustment. */ | 25 | adjustment = 10; /* Set default adjustment. */ |
26 | 26 | ||
27 | if (argv[0][0] == '-') { | 27 | if (argv[0][0] == '-') { |
28 | if (argv[0][1] == 'n') { /* -n */ | 28 | if (argv[0][1] == 'n') { /* -n */ |
@@ -32,7 +32,7 @@ int nice_main(int argc, char **argv) | |||
32 | } else { /* -NNN (NNN may be negative) == -n NNN */ | 32 | } else { /* -NNN (NNN may be negative) == -n NNN */ |
33 | argv[0] += 1; argv--; argc++; | 33 | argv[0] += 1; argv--; argc++; |
34 | } | 34 | } |
35 | if (argc < 4) { /* Missing priority and/or utility! */ | 35 | if (argc < 4) { /* Missing priority and/or utility! */ |
36 | bb_show_usage(); | 36 | bb_show_usage(); |
37 | } | 37 | } |
38 | adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2); | 38 | adjustment = xatoi_range(argv[1], INT_MIN/2, INT_MAX/2); |
diff --git a/coreutils/od.c b/coreutils/od.c index dcd693446..e62711671 100644 --- a/coreutils/od.c +++ b/coreutils/od.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Based on code from util-linux v 2.11l | 4 | * Based on code from util-linux v 2.11l |
5 | * | 5 | * |
6 | * Copyright (c) 1990 | 6 | * Copyright (c) 1990 |
7 | * The Regents of the University of California. All rights reserved. | 7 | * The Regents of the University of California. All rights reserved. |
8 | * | 8 | * |
9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
10 | * | 10 | * |
@@ -174,7 +174,7 @@ int od_main(int argc, char **argv) | |||
174 | bb_dump_add(dumper, "\" \""); | 174 | bb_dump_add(dumper, "\" \""); |
175 | } | 175 | } |
176 | bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]); | 176 | bb_dump_add(dumper, add_strings[(int)od_o2si[(p - od_opts)]]); |
177 | } else { /* P, p, s, w, or other unhandled */ | 177 | } else { /* P, p, s, w, or other unhandled */ |
178 | bb_show_usage(); | 178 | bb_show_usage(); |
179 | } | 179 | } |
180 | } | 180 | } |
diff --git a/coreutils/sort.c b/coreutils/sort.c index eccc2d437..3562464d1 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c | |||
@@ -52,8 +52,8 @@ enum { | |||
52 | static char key_separator; | 52 | static char key_separator; |
53 | 53 | ||
54 | static struct sort_key { | 54 | static struct sort_key { |
55 | struct sort_key *next_key; /* linked list */ | 55 | struct sort_key *next_key; /* linked list */ |
56 | unsigned range[4]; /* start word, start char, end word, end char */ | 56 | unsigned range[4]; /* start word, start char, end word, end char */ |
57 | unsigned flags; | 57 | unsigned flags; |
58 | } *key_list; | 58 | } *key_list; |
59 | 59 | ||
diff --git a/coreutils/test.c b/coreutils/test.c index f18e3ae5a..6524c4f07 100644 --- a/coreutils/test.c +++ b/coreutils/test.c | |||
@@ -49,9 +49,9 @@ | |||
49 | * state. */ | 49 | * state. */ |
50 | 50 | ||
51 | /* test(1) accepts the following grammar: | 51 | /* test(1) accepts the following grammar: |
52 | oexpr ::= aexpr | aexpr "-o" oexpr ; | 52 | oexpr ::= aexpr | aexpr "-o" oexpr ; |
53 | aexpr ::= nexpr | nexpr "-a" aexpr ; | 53 | aexpr ::= nexpr | nexpr "-a" aexpr ; |
54 | nexpr ::= primary | "!" primary | 54 | nexpr ::= primary | "!" primary |
55 | primary ::= unary-operator operand | 55 | primary ::= unary-operator operand |
56 | | operand binary-operator operand | 56 | | operand binary-operator operand |
57 | | operand | 57 | | operand |
diff --git a/coreutils/tr.c b/coreutils/tr.c index d6bc7d20a..21d77ef95 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c | |||
@@ -203,7 +203,7 @@ static unsigned expand(const char *arg, char **buffer_p) | |||
203 | buffer[pos++] = *arg; /* copy CHAR */ | 203 | buffer[pos++] = *arg; /* copy CHAR */ |
204 | if (!arg[0] || arg[1] != '=' || arg[2] != ']') | 204 | if (!arg[0] || arg[1] != '=' || arg[2] != ']') |
205 | bb_show_usage(); | 205 | bb_show_usage(); |
206 | arg += 3; /* skip CHAR=] */ | 206 | arg += 3; /* skip CHAR=] */ |
207 | continue; | 207 | continue; |
208 | } | 208 | } |
209 | /* The rest of "[xyz..." cases is treated as normal | 209 | /* The rest of "[xyz..." cases is treated as normal |
@@ -258,9 +258,9 @@ int tr_main(int argc UNUSED_PARAM, char **argv) | |||
258 | char *invec = vector + ASCII; | 258 | char *invec = vector + ASCII; |
259 | char *outvec = vector + ASCII * 2; | 259 | char *outvec = vector + ASCII * 2; |
260 | 260 | ||
261 | #define TR_OPT_complement (3 << 0) | 261 | #define TR_OPT_complement (3 << 0) |
262 | #define TR_OPT_delete (1 << 2) | 262 | #define TR_OPT_delete (1 << 2) |
263 | #define TR_OPT_squeeze_reps (1 << 3) | 263 | #define TR_OPT_squeeze_reps (1 << 3) |
264 | 264 | ||
265 | for (i = 0; i < ASCII; i++) { | 265 | for (i = 0; i < ASCII; i++) { |
266 | vector[i] = i; | 266 | vector[i] = i; |
diff --git a/coreutils/wc.c b/coreutils/wc.c index ecadae59b..fe3f274f8 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c | |||
@@ -153,7 +153,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv) | |||
153 | bb_simple_perror_msg(arg); | 153 | bb_simple_perror_msg(arg); |
154 | status = EXIT_FAILURE; | 154 | status = EXIT_FAILURE; |
155 | } | 155 | } |
156 | goto DO_EOF; /* Treat an EOF as '\r'. */ | 156 | goto DO_EOF; /* Treat an EOF as '\r'. */ |
157 | } | 157 | } |
158 | 158 | ||
159 | /* Cater for -c and -m */ | 159 | /* Cater for -c and -m */ |
@@ -179,7 +179,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv) | |||
179 | */ | 179 | */ |
180 | if (c == '\t') { | 180 | if (c == '\t') { |
181 | linepos = (linepos | 7) + 1; | 181 | linepos = (linepos | 7) + 1; |
182 | } else { /* '\n', '\r', '\f', or '\v' */ | 182 | } else { /* '\n', '\r', '\f', or '\v' */ |
183 | DO_EOF: | 183 | DO_EOF: |
184 | if (linepos > counts[WC_LENGTH]) { | 184 | if (linepos > counts[WC_LENGTH]) { |
185 | counts[WC_LENGTH] = linepos; | 185 | counts[WC_LENGTH] = linepos; |
@@ -230,7 +230,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv) | |||
230 | * effect of trashing the totals array after outputting it, but that's | 230 | * effect of trashing the totals array after outputting it, but that's |
231 | * irrelavent since we no longer need it. */ | 231 | * irrelavent since we no longer need it. */ |
232 | if (num_files > 1) { | 232 | if (num_files > 1) { |
233 | num_files = 0; /* Make sure we don't get here again. */ | 233 | num_files = 0; /* Make sure we don't get here again. */ |
234 | arg = "total"; | 234 | arg = "total"; |
235 | pcounts = totals; | 235 | pcounts = totals; |
236 | --argv; | 236 | --argv; |