diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-16 04:09:25 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-16 04:09:25 +0000 |
commit | f45c4f41b792e4b7c52eaf21b9540112887e861b (patch) | |
tree | e5f35073f61b6178d49d02821676894f32b7a32f | |
parent | 57c899e4c2be4d0bddeaaca9c34ea0f484f92ad8 (diff) | |
download | busybox-w32-f45c4f41b792e4b7c52eaf21b9540112887e861b.tar.gz busybox-w32-f45c4f41b792e4b7c52eaf21b9540112887e861b.tar.bz2 busybox-w32-f45c4f41b792e4b7c52eaf21b9540112887e861b.zip |
whitespace and comment fixes, no code changes
-rw-r--r-- | docs/busybox.net/news.html | 2 | ||||
-rw-r--r-- | libbb/pw_encrypt.c | 4 | ||||
-rw-r--r-- | libbb/pw_encrypt_des.c | 6 | ||||
-rw-r--r-- | loginutils/Config.in | 4 | ||||
-rw-r--r-- | modutils/Config.in | 8 | ||||
-rw-r--r-- | modutils/depmod.c | 2 | ||||
-rw-r--r-- | modutils/modprobe.c | 6 | ||||
-rw-r--r-- | networking/arp.c | 2 | ||||
-rw-r--r-- | util-linux/fdisk_osf.c | 2 |
9 files changed, 16 insertions, 20 deletions
diff --git a/docs/busybox.net/news.html b/docs/busybox.net/news.html index f13901f04..47e61f21a 100644 --- a/docs/busybox.net/news.html +++ b/docs/busybox.net/news.html | |||
@@ -191,7 +191,7 @@ iproute_list_or_flush 3680 readhere 2308 | |||
191 | <li>tail: fix "tail -c 20 /dev/huge_disk" (was taking ages) | 191 | <li>tail: fix "tail -c 20 /dev/huge_disk" (was taking ages) |
192 | <li>tar: compat: handle tarballs with only one zero block at the end | 192 | <li>tar: compat: handle tarballs with only one zero block at the end |
193 | <li>tar: autodetection of gz/bz2 compressed tarballs. Closes bug 992 | 193 | <li>tar: autodetection of gz/bz2 compressed tarballs. Closes bug 992 |
194 | <li>tar: real support for -p. By Natanael Copa <natanael.copa at gmail.com> | 194 | <li>tar: real support for -p. By Natanael Copa <natanael.copa at gmail.com> |
195 | <li>tcpudp: narrow down time window where we have no wildcard socket | 195 | <li>tcpudp: narrow down time window where we have no wildcard socket |
196 | <li>telnetd: use login always, not "sometimes login, sometimes shell" | 196 | <li>telnetd: use login always, not "sometimes login, sometimes shell" |
197 | <li>test: fix mishandling of "test ! arg1 op arg2 more args" | 197 | <li>test: fix mishandling of "test ! arg1 op arg2 more args" |
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c index c1e927e23..73631865c 100644 --- a/libbb/pw_encrypt.c +++ b/libbb/pw_encrypt.c | |||
@@ -14,10 +14,6 @@ | |||
14 | /* | 14 | /* |
15 | * DES and MD5 crypt implementations are taken from uclibc. | 15 | * DES and MD5 crypt implementations are taken from uclibc. |
16 | * They were modified to not use static buffers. | 16 | * They were modified to not use static buffers. |
17 | * Comparison with uclibc (before uclibc had 70k staic buffers reinstated): | ||
18 | * text data bss dec hex filename | ||
19 | * 759909 604 6684 767197 bb4dd busybox_old | ||
20 | * 759579 604 6684 766867 bb393 busybox_unstripped | ||
21 | */ | 17 | */ |
22 | /* Common for them */ | 18 | /* Common for them */ |
23 | static const uint8_t ascii64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; | 19 | static const uint8_t ascii64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; |
diff --git a/libbb/pw_encrypt_des.c b/libbb/pw_encrypt_des.c index a13e1a5df..cd19a63f7 100644 --- a/libbb/pw_encrypt_des.c +++ b/libbb/pw_encrypt_des.c | |||
@@ -201,7 +201,7 @@ static const uint32_t bits32[32] = | |||
201 | static const uint8_t bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; | 201 | static const uint8_t bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; |
202 | 202 | ||
203 | 203 | ||
204 | static int | 204 | static int |
205 | ascii_to_bin(char ch) | 205 | ascii_to_bin(char ch) |
206 | { | 206 | { |
207 | if (ch > 'z') | 207 | if (ch > 'z') |
@@ -220,8 +220,8 @@ ascii_to_bin(char ch) | |||
220 | } | 220 | } |
221 | 221 | ||
222 | 222 | ||
223 | /* Static stuff that stays resident and doesn't change after | 223 | /* Static stuff that stays resident and doesn't change after |
224 | * being initialized, and therefore doesn't need to be made | 224 | * being initialized, and therefore doesn't need to be made |
225 | * reentrant. */ | 225 | * reentrant. */ |
226 | struct const_des_ctx { | 226 | struct const_des_ctx { |
227 | #if USE_ip_mask | 227 | #if USE_ip_mask |
diff --git a/loginutils/Config.in b/loginutils/Config.in index c3c8dd513..4ca1c2597 100644 --- a/loginutils/Config.in +++ b/loginutils/Config.in | |||
@@ -71,8 +71,8 @@ config USE_BB_CRYPT | |||
71 | DES encryption/decryption. | 71 | DES encryption/decryption. |
72 | 72 | ||
73 | For busybox, having large static buffers is undesirable, | 73 | For busybox, having large static buffers is undesirable, |
74 | especially on NOMMU machines. Busybox also doesn't | 74 | especially on NOMMU machines. Busybox also doesn't need |
75 | need DES encryption/decryption and can do with smaller code. | 75 | DES encryption/decryption and can do with smaller code. |
76 | 76 | ||
77 | If you enable this option, it will add about 4.8k of code | 77 | If you enable this option, it will add about 4.8k of code |
78 | if you are building dynamically linked executable. | 78 | if you are building dynamically linked executable. |
diff --git a/modutils/Config.in b/modutils/Config.in index c0dff1a4c..2b0bcdd6e 100644 --- a/modutils/Config.in +++ b/modutils/Config.in | |||
@@ -153,10 +153,10 @@ config FEATURE_MODPROBE_BLACKLIST | |||
153 | default n | 153 | default n |
154 | depends on MODPROBE && FEATURE_2_6_MODULES | 154 | depends on MODPROBE && FEATURE_2_6_MODULES |
155 | help | 155 | help |
156 | Say 'y' here to enable support for the 'blacklist' command in | 156 | Say 'y' here to enable support for the 'blacklist' command in |
157 | modprobe.conf. This prevents the alias resolver to resolve | 157 | modprobe.conf. This prevents the alias resolver to resolve |
158 | blacklisted modules. This is useful if you want to prevent your | 158 | blacklisted modules. This is useful if you want to prevent your |
159 | hardware autodetection scripts to load modules like evdev, frame | 159 | hardware autodetection scripts to load modules like evdev, frame |
160 | buffer drivers etc. | 160 | buffer drivers etc. |
161 | 161 | ||
162 | comment "Options common to multiple modutils" | 162 | comment "Options common to multiple modutils" |
diff --git a/modutils/depmod.c b/modutils/depmod.c index 733cd95bf..4998d641d 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c | |||
@@ -181,7 +181,7 @@ int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv) | |||
181 | char *shortname = llist_pop(&old_deps); | 181 | char *shortname = llist_pop(&old_deps); |
182 | 182 | ||
183 | while (all) { | 183 | while (all) { |
184 | char *nam = | 184 | char *nam = |
185 | xstrdup(bb_get_last_path_component_nostrip(all->name)); | 185 | xstrdup(bb_get_last_path_component_nostrip(all->name)); |
186 | char *tmp = strrstr(nam, ".ko"); | 186 | char *tmp = strrstr(nam, ".ko"); |
187 | 187 | ||
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index db946bb2e..84a2d7686 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -232,10 +232,10 @@ static char *parse_command_string(char *src, char **dst) | |||
232 | #endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */ | 232 | #endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */ |
233 | 233 | ||
234 | static int is_conf_command(char *buffer, const char *command) | 234 | static int is_conf_command(char *buffer, const char *command) |
235 | { | 235 | { |
236 | int len = strlen(command); | 236 | int len = strlen(command); |
237 | return ((strstr(buffer, command) == buffer) && | 237 | return ((strstr(buffer, command) == buffer) && |
238 | isspace(buffer[len])); | 238 | isspace(buffer[len])); |
239 | } | 239 | } |
240 | 240 | ||
241 | /* | 241 | /* |
@@ -325,7 +325,7 @@ static void include_conf(struct dep_t **first, struct dep_t **current, char *buf | |||
325 | include_conf(first, current, buffer, buflen, fdi); | 325 | include_conf(first, current, buffer, buflen, fdi); |
326 | close(fdi); | 326 | close(fdi); |
327 | } | 327 | } |
328 | } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST && | 328 | } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST && |
329 | (is_conf_command(buffer, "blacklist"))) { | 329 | (is_conf_command(buffer, "blacklist"))) { |
330 | char *mod; | 330 | char *mod; |
331 | struct dep_t *dt; | 331 | struct dep_t *dt; |
diff --git a/networking/arp.c b/networking/arp.c index f85a91022..ae1bb1a2e 100644 --- a/networking/arp.c +++ b/networking/arp.c | |||
@@ -314,7 +314,7 @@ arp_disp(const char *name, char *ip, int type, int arp_flags, | |||
314 | char *hwa, char *mask, char *dev) | 314 | char *hwa, char *mask, char *dev) |
315 | { | 315 | { |
316 | static const int arp_masks[] = { | 316 | static const int arp_masks[] = { |
317 | ATF_PERM, ATF_PUBL, | 317 | ATF_PERM, ATF_PUBL, |
318 | #ifdef HAVE_ATF_MAGIC | 318 | #ifdef HAVE_ATF_MAGIC |
319 | ATF_MAGIC, | 319 | ATF_MAGIC, |
320 | #endif | 320 | #endif |
diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c index 30c42553b..24f240af3 100644 --- a/util-linux/fdisk_osf.c +++ b/util-linux/fdisk_osf.c | |||
@@ -516,7 +516,7 @@ xbsd_print_disklabel(int show_all) | |||
516 | printf("disk: %.*s\n", (int) sizeof(lp->d_typename), lp->d_typename); | 516 | printf("disk: %.*s\n", (int) sizeof(lp->d_typename), lp->d_typename); |
517 | printf("label: %.*s\n", (int) sizeof(lp->d_packname), lp->d_packname); | 517 | printf("label: %.*s\n", (int) sizeof(lp->d_packname), lp->d_packname); |
518 | printf("flags: "); | 518 | printf("flags: "); |
519 | print_flags_separated(d_masks, "removable\0""ecc\0""badsect\0", lp->d_flags, " "); | 519 | print_flags_separated(d_masks, "removable\0""ecc\0""badsect\0", lp->d_flags, " "); |
520 | bb_putchar('\n'); | 520 | bb_putchar('\n'); |
521 | /* On various machines the fields of *lp are short/int/long */ | 521 | /* On various machines the fields of *lp are short/int/long */ |
522 | /* In order to avoid problems, we cast them all to long. */ | 522 | /* In order to avoid problems, we cast them all to long. */ |