diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-28 18:57:19 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-28 18:57:19 +0200 |
commit | e4dcba1c103dc28e927e004791e331aaf604383d (patch) | |
tree | a18094ecc54fcea2cb523a802e0c414c3e6f85bf /miscutils | |
parent | 776509544123c68bbc128c0fdb2f699062d294cf (diff) | |
download | busybox-w32-e4dcba1c103dc28e927e004791e331aaf604383d.tar.gz busybox-w32-e4dcba1c103dc28e927e004791e331aaf604383d.tar.bz2 busybox-w32-e4dcba1c103dc28e927e004791e331aaf604383d.zip |
*: whitespace fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/chat.c | 2 | ||||
-rw-r--r-- | miscutils/crond.c | 4 | ||||
-rw-r--r-- | miscutils/devfsd.c | 2 | ||||
-rw-r--r-- | miscutils/flash_eraseall.c | 8 | ||||
-rw-r--r-- | miscutils/hdparm.c | 2 | ||||
-rw-r--r-- | miscutils/last.c | 10 | ||||
-rw-r--r-- | miscutils/less.c | 6 | ||||
-rw-r--r-- | miscutils/makedevs.c | 2 | ||||
-rw-r--r-- | miscutils/mt.c | 2 | ||||
-rw-r--r-- | miscutils/nandwrite.c | 12 | ||||
-rw-r--r-- | miscutils/runlevel.c | 8 | ||||
-rw-r--r-- | miscutils/strings.c | 8 | ||||
-rw-r--r-- | miscutils/watchdog.c | 2 |
13 files changed, 34 insertions, 34 deletions
diff --git a/miscutils/chat.c b/miscutils/chat.c index 2040c3f6a..8b151fda4 100644 --- a/miscutils/chat.c +++ b/miscutils/chat.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include "libbb.h" | 10 | #include "libbb.h" |
11 | 11 | ||
12 | // default timeout: 45 sec | 12 | // default timeout: 45 sec |
13 | #define DEFAULT_CHAT_TIMEOUT 45*1000 | 13 | #define DEFAULT_CHAT_TIMEOUT 45*1000 |
14 | // max length of "abort string", | 14 | // max length of "abort string", |
15 | // i.e. device reply which causes termination | 15 | // i.e. device reply which causes termination |
16 | #define MAX_ABORT_LEN 50 | 16 | #define MAX_ABORT_LEN 50 |
diff --git a/miscutils/crond.c b/miscutils/crond.c index 7f2d54c9f..5bf053609 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
@@ -35,7 +35,7 @@ | |||
35 | # define CRONUPDATE "cron.update" | 35 | # define CRONUPDATE "cron.update" |
36 | #endif | 36 | #endif |
37 | #ifndef MAXLINES | 37 | #ifndef MAXLINES |
38 | # define MAXLINES 256 /* max lines in non-root crontabs */ | 38 | # define MAXLINES 256 /* max lines in non-root crontabs */ |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | 41 | ||
@@ -170,7 +170,7 @@ static void ParseField(char *user, char *ary, int modvalue, int off, | |||
170 | 170 | ||
171 | /* Handle numeric digit or symbol or '*' */ | 171 | /* Handle numeric digit or symbol or '*' */ |
172 | if (*ptr == '*') { | 172 | if (*ptr == '*') { |
173 | n1 = 0; /* everything will be filled */ | 173 | n1 = 0; /* everything will be filled */ |
174 | n2 = modvalue - 1; | 174 | n2 = modvalue - 1; |
175 | skip = 1; | 175 | skip = 1; |
176 | ++ptr; | 176 | ++ptr; |
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 8f19288cc..35e431951 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -75,7 +75,7 @@ | |||
75 | 75 | ||
76 | /* Various defines taken from linux/devfs_fs.h */ | 76 | /* Various defines taken from linux/devfs_fs.h */ |
77 | #define DEVFSD_PROTOCOL_REVISION_KERNEL 5 | 77 | #define DEVFSD_PROTOCOL_REVISION_KERNEL 5 |
78 | #define DEVFSD_IOCTL_BASE 'd' | 78 | #define DEVFSD_IOCTL_BASE 'd' |
79 | /* These are the various ioctls */ | 79 | /* These are the various ioctls */ |
80 | #define DEVFSDIOC_GET_PROTO_REV _IOR(DEVFSD_IOCTL_BASE, 0, int) | 80 | #define DEVFSDIOC_GET_PROTO_REV _IOR(DEVFSD_IOCTL_BASE, 0, int) |
81 | #define DEVFSDIOC_SET_EVENT_MASK _IOW(DEVFSD_IOCTL_BASE, 2, int) | 81 | #define DEVFSDIOC_SET_EVENT_MASK _IOW(DEVFSD_IOCTL_BASE, 2, int) |
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c index b832cc1dd..68596e11b 100644 --- a/miscutils/flash_eraseall.c +++ b/miscutils/flash_eraseall.c | |||
@@ -14,10 +14,10 @@ | |||
14 | #include <mtd/mtd-user.h> | 14 | #include <mtd/mtd-user.h> |
15 | #include <linux/jffs2.h> | 15 | #include <linux/jffs2.h> |
16 | 16 | ||
17 | #define OPTION_J (1 << 0) | 17 | #define OPTION_J (1 << 0) |
18 | #define OPTION_Q (1 << 1) | 18 | #define OPTION_Q (1 << 1) |
19 | #define IS_NAND (1 << 2) | 19 | #define IS_NAND (1 << 2) |
20 | #define BBTEST (1 << 3) | 20 | #define BBTEST (1 << 3) |
21 | 21 | ||
22 | /* mtd/jffs2-user.h used to have this atrocity: | 22 | /* mtd/jffs2-user.h used to have this atrocity: |
23 | extern int target_endian; | 23 | extern int target_endian; |
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c index d946c7165..38b265d60 100644 --- a/miscutils/hdparm.c +++ b/miscutils/hdparm.c | |||
@@ -1745,7 +1745,7 @@ static void process_dev(char *devname) | |||
1745 | if (-1 == read(fd, buf, sizeof(buf))) | 1745 | if (-1 == read(fd, buf, sizeof(buf))) |
1746 | bb_perror_msg("read of 512 bytes failed"); | 1746 | bb_perror_msg("read of 512 bytes failed"); |
1747 | } | 1747 | } |
1748 | #endif /* HDIO_DRIVE_CMD */ | 1748 | #endif /* HDIO_DRIVE_CMD */ |
1749 | if (getset_mult || get_identity) { | 1749 | if (getset_mult || get_identity) { |
1750 | multcount = -1; | 1750 | multcount = -1; |
1751 | if (ioctl(fd, HDIO_GET_MULTCOUNT, &multcount)) { | 1751 | if (ioctl(fd, HDIO_GET_MULTCOUNT, &multcount)) { |
diff --git a/miscutils/last.c b/miscutils/last.c index 888a0a3d1..fec5b70a8 100644 --- a/miscutils/last.c +++ b/miscutils/last.c | |||
@@ -46,14 +46,14 @@ int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
46 | static const char _ut_lin[] ALIGN1 = | 46 | static const char _ut_lin[] ALIGN1 = |
47 | "~\0" "{\0" "|\0" /* "LOGIN\0" "date\0" */; | 47 | "~\0" "{\0" "|\0" /* "LOGIN\0" "date\0" */; |
48 | enum { | 48 | enum { |
49 | TYPE_RUN_LVL = RUN_LVL, /* 1 */ | 49 | TYPE_RUN_LVL = RUN_LVL, /* 1 */ |
50 | TYPE_BOOT_TIME = BOOT_TIME, /* 2 */ | 50 | TYPE_BOOT_TIME = BOOT_TIME, /* 2 */ |
51 | TYPE_SHUTDOWN_TIME = SHUTDOWN_TIME | 51 | TYPE_SHUTDOWN_TIME = SHUTDOWN_TIME |
52 | }; | 52 | }; |
53 | enum { | 53 | enum { |
54 | _TILDE = EMPTY, /* 0 */ | 54 | _TILDE = EMPTY, /* 0 */ |
55 | TYPE_NEW_TIME, /* NEW_TIME, 3 */ | 55 | TYPE_NEW_TIME, /* NEW_TIME, 3 */ |
56 | TYPE_OLD_TIME /* OLD_TIME, 4 */ | 56 | TYPE_OLD_TIME /* OLD_TIME, 4 */ |
57 | }; | 57 | }; |
58 | 58 | ||
59 | if (argv[1]) { | 59 | if (argv[1]) { |
diff --git a/miscutils/less.c b/miscutils/less.c index d737e4cba..500059d2a 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * redirected input has been read from stdin | 21 | * redirected input has been read from stdin |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <sched.h> /* sched_yield() */ | 24 | #include <sched.h> /* sched_yield() */ |
25 | 25 | ||
26 | #include "libbb.h" | 26 | #include "libbb.h" |
27 | #if ENABLE_FEATURE_LESS_REGEXP | 27 | #if ENABLE_FEATURE_LESS_REGEXP |
@@ -477,7 +477,7 @@ static void m_status_print(void) | |||
477 | { | 477 | { |
478 | int percentage; | 478 | int percentage; |
479 | 479 | ||
480 | if (less_gets_pos >= 0) /* don't touch statusline while input is done! */ | 480 | if (less_gets_pos >= 0) /* don't touch statusline while input is done! */ |
481 | return; | 481 | return; |
482 | 482 | ||
483 | clear_line(); | 483 | clear_line(); |
@@ -503,7 +503,7 @@ static void status_print(void) | |||
503 | { | 503 | { |
504 | const char *p; | 504 | const char *p; |
505 | 505 | ||
506 | if (less_gets_pos >= 0) /* don't touch statusline while input is done! */ | 506 | if (less_gets_pos >= 0) /* don't touch statusline while input is done! */ |
507 | return; | 507 | return; |
508 | 508 | ||
509 | /* Change the status if flags have been set */ | 509 | /* Change the status if flags have been set */ |
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c index bba7fa61d..e74c47c35 100644 --- a/miscutils/makedevs.c +++ b/miscutils/makedevs.c | |||
@@ -121,7 +121,7 @@ int makedevs_main(int argc UNUSED_PARAM, char **argv) | |||
121 | 121 | ||
122 | if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", | 122 | if ((2 > sscanf(line, "%40s %c %o %40s %40s %u %u %u %u %u", |
123 | name, &type, &mode, user, group, | 123 | name, &type, &mode, user, group, |
124 | &major, &minor, &start, &increment, &count)) | 124 | &major, &minor, &start, &increment, &count)) |
125 | || ((unsigned)(major | minor | start | count | increment) > 255) | 125 | || ((unsigned)(major | minor | start | count | increment) > 255) |
126 | ) { | 126 | ) { |
127 | bb_error_msg("invalid line %d: '%s'", linenum, line); | 127 | bb_error_msg("invalid line %d: '%s'", linenum, line); |
diff --git a/miscutils/mt.c b/miscutils/mt.c index d19866a5f..142901bb0 100644 --- a/miscutils/mt.c +++ b/miscutils/mt.c | |||
@@ -108,7 +108,7 @@ int mt_main(int argc UNUSED_PARAM, char **argv) | |||
108 | if (argv[2]) | 108 | if (argv[2]) |
109 | op.mt_count = xatoi_positive(argv[2]); | 109 | op.mt_count = xatoi_positive(argv[2]); |
110 | else | 110 | else |
111 | op.mt_count = 1; /* One, not zero, right? */ | 111 | op.mt_count = 1; /* One, not zero, right? */ |
112 | 112 | ||
113 | switch (opcode_value[idx]) { | 113 | switch (opcode_value[idx]) { |
114 | case MTWEOF: | 114 | case MTWEOF: |
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c index de30a0c1f..831d2f76b 100644 --- a/miscutils/nandwrite.c +++ b/miscutils/nandwrite.c | |||
@@ -53,12 +53,12 @@ | |||
53 | #define IS_NANDDUMP (ENABLE_NANDDUMP && (!ENABLE_NANDWRITE || (applet_name[4] == 'd'))) | 53 | #define IS_NANDDUMP (ENABLE_NANDDUMP && (!ENABLE_NANDWRITE || (applet_name[4] == 'd'))) |
54 | #define IS_NANDWRITE (ENABLE_NANDWRITE && (!ENABLE_NANDDUMP || (applet_name[4] != 'd'))) | 54 | #define IS_NANDWRITE (ENABLE_NANDWRITE && (!ENABLE_NANDDUMP || (applet_name[4] != 'd'))) |
55 | 55 | ||
56 | #define OPT_p (1 << 0) /* nandwrite only */ | 56 | #define OPT_p (1 << 0) /* nandwrite only */ |
57 | #define OPT_o (1 << 0) /* nanddump only */ | 57 | #define OPT_o (1 << 0) /* nanddump only */ |
58 | #define OPT_s (1 << 1) | 58 | #define OPT_s (1 << 1) |
59 | #define OPT_b (1 << 2) | 59 | #define OPT_b (1 << 2) |
60 | #define OPT_f (1 << 3) | 60 | #define OPT_f (1 << 3) |
61 | #define OPT_l (1 << 4) | 61 | #define OPT_l (1 << 4) |
62 | 62 | ||
63 | /* helper for writing out 0xff for bad blocks pad */ | 63 | /* helper for writing out 0xff for bad blocks pad */ |
64 | static void dump_bad(struct mtd_info_user *meminfo, unsigned len, int oob) | 64 | static void dump_bad(struct mtd_info_user *meminfo, unsigned len, int oob) |
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c index 608e87fe1..363e45049 100644 --- a/miscutils/runlevel.c +++ b/miscutils/runlevel.c | |||
@@ -1,11 +1,11 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * runlevel Prints out the previous and the current runlevel. | 3 | * Prints out the previous and the current runlevel. |
4 | * | 4 | * |
5 | * Version: @(#)runlevel 1.20 16-Apr-1997 MvS | 5 | * Version: @(#)runlevel 1.20 16-Apr-1997 MvS |
6 | * | 6 | * |
7 | * This file is part of the sysvinit suite, | 7 | * This file is part of the sysvinit suite, |
8 | * Copyright 1991-1997 Miquel van Smoorenburg. | 8 | * Copyright 1991-1997 Miquel van Smoorenburg. |
9 | * | 9 | * |
10 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 10 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
11 | * | 11 | * |
diff --git a/miscutils/strings.c b/miscutils/strings.c index 40478de40..7ab0e227c 100644 --- a/miscutils/strings.c +++ b/miscutils/strings.c | |||
@@ -9,10 +9,10 @@ | |||
9 | 9 | ||
10 | #include "libbb.h" | 10 | #include "libbb.h" |
11 | 11 | ||
12 | #define WHOLE_FILE 1 | 12 | #define WHOLE_FILE 1 |
13 | #define PRINT_NAME 2 | 13 | #define PRINT_NAME 2 |
14 | #define PRINT_OFFSET 4 | 14 | #define PRINT_OFFSET 4 |
15 | #define SIZE 8 | 15 | #define SIZE 8 |
16 | 16 | ||
17 | int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 17 | int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
18 | int strings_main(int argc UNUSED_PARAM, char **argv) | 18 | int strings_main(int argc UNUSED_PARAM, char **argv) |
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index 332539658..36902a214 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c | |||
@@ -21,7 +21,7 @@ static void watchdog_shutdown(int sig UNUSED_PARAM) | |||
21 | { | 21 | { |
22 | static const char V = 'V'; | 22 | static const char V = 'V'; |
23 | 23 | ||
24 | write(3, &V, 1); /* Magic, see watchdog-api.txt in kernel */ | 24 | write(3, &V, 1); /* Magic, see watchdog-api.txt in kernel */ |
25 | if (ENABLE_FEATURE_CLEAN_UP) | 25 | if (ENABLE_FEATURE_CLEAN_UP) |
26 | close(3); | 26 | close(3); |
27 | exit(EXIT_SUCCESS); | 27 | exit(EXIT_SUCCESS); |