diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-24 02:18:03 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-24 02:18:03 +0000 |
commit | c693840fe81e59a308e0c6e3d2bafae728d1caff (patch) | |
tree | 10924edda7796e5242e460364c2f3587f2841c0f | |
parent | 42cc304e9084843ad6b153afaf4b3f6c6528c364 (diff) | |
download | busybox-w32-c693840fe81e59a308e0c6e3d2bafae728d1caff.tar.gz busybox-w32-c693840fe81e59a308e0c6e3d2bafae728d1caff.tar.bz2 busybox-w32-c693840fe81e59a308e0c6e3d2bafae728d1caff.zip |
*: whitespace fixes, no code changes
-rw-r--r-- | editors/patch.c | 4 | ||||
-rw-r--r-- | editors/vi.c | 2 | ||||
-rw-r--r-- | init/init.c | 4 | ||||
-rw-r--r-- | libbb/login.c | 2 | ||||
-rw-r--r-- | libbb/safe_gethostname.c | 2 | ||||
-rw-r--r-- | networking/ifenslave.c | 46 | ||||
-rw-r--r-- | networking/inetd.c | 4 | ||||
-rw-r--r-- | networking/sendmail.c | 6 | ||||
-rw-r--r-- | printutils/lpd.c | 20 | ||||
-rw-r--r-- | scripts/Makefile.host | 2 | ||||
-rw-r--r-- | shell/msh.c | 2 | ||||
-rw-r--r-- | util-linux/volume_id/fat.c | 2 | ||||
-rw-r--r-- | util-linux/volume_id/unused_ufs.c | 10 |
13 files changed, 53 insertions, 53 deletions
diff --git a/editors/patch.c b/editors/patch.c index a2d593d87..e0fb58f87 100644 --- a/editors/patch.c +++ b/editors/patch.c | |||
@@ -74,7 +74,7 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
74 | int patch_level; | 74 | int patch_level; |
75 | int ret = 0; | 75 | int ret = 0; |
76 | 76 | ||
77 | xfunc_error_retval = 2; | 77 | xfunc_error_retval = 2; |
78 | { | 78 | { |
79 | const char *p = "-1"; | 79 | const char *p = "-1"; |
80 | const char *i = "-"; /* compat */ | 80 | const char *i = "-"; /* compat */ |
@@ -114,7 +114,7 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
114 | if (!patch_line || strncmp(patch_line, "+++ ", 4) != 0) | 114 | if (!patch_line || strncmp(patch_line, "+++ ", 4) != 0) |
115 | bb_error_msg_and_die("invalid patch"); | 115 | bb_error_msg_and_die("invalid patch"); |
116 | new_filename = extract_filename_and_free_line(patch_line, patch_level); | 116 | new_filename = extract_filename_and_free_line(patch_line, patch_level); |
117 | 117 | ||
118 | /* Get access rights from the file to be patched, -1 file does not exist */ | 118 | /* Get access rights from the file to be patched, -1 file does not exist */ |
119 | if (stat(new_filename, &saved_stat) != 0) { | 119 | if (stat(new_filename, &saved_stat) != 0) { |
120 | char *line_ptr; | 120 | char *line_ptr; |
diff --git a/editors/vi.c b/editors/vi.c index 65fb0265e..454cfcee4 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -419,7 +419,7 @@ int vi_main(int argc, char **argv) | |||
419 | /* fall through */ | 419 | /* fall through */ |
420 | 420 | ||
421 | default: | 421 | default: |
422 | bb_show_usage(); | 422 | bb_show_usage(); |
423 | return 1; | 423 | return 1; |
424 | } | 424 | } |
425 | } | 425 | } |
diff --git a/init/init.c b/init/init.c index c4674a55f..61b302556 100644 --- a/init/init.c +++ b/init/init.c | |||
@@ -230,8 +230,8 @@ static void console_init(void) | |||
230 | /* Give me _ANY_ open descriptor! */ | 230 | /* Give me _ANY_ open descriptor! */ |
231 | fd = xopen("/", O_RDONLY); /* we don't believe this can fail */ | 231 | fd = xopen("/", O_RDONLY); /* we don't believe this can fail */ |
232 | } | 232 | } |
233 | while ((unsigned)fd < 2) | 233 | while ((unsigned)fd < 2) |
234 | fd = dup(fd); | 234 | fd = dup(fd); |
235 | if (fd > 2) | 235 | if (fd > 2) |
236 | close(fd); | 236 | close(fd); |
237 | } | 237 | } |
diff --git a/libbb/login.c b/libbb/login.c index a711a5437..a5be2c8c9 100644 --- a/libbb/login.c +++ b/libbb/login.c | |||
@@ -89,7 +89,7 @@ void print_login_issue(const char *issue_file, const char *tty) | |||
89 | void print_login_prompt(void) | 89 | void print_login_prompt(void) |
90 | { | 90 | { |
91 | char *hostname = safe_gethostname(); | 91 | char *hostname = safe_gethostname(); |
92 | 92 | ||
93 | fputs(hostname, stdout); | 93 | fputs(hostname, stdout); |
94 | fputs(LOGIN, stdout); | 94 | fputs(LOGIN, stdout); |
95 | fflush(stdout); | 95 | fflush(stdout); |
diff --git a/libbb/safe_gethostname.c b/libbb/safe_gethostname.c index 1290f4ca7..3b24edba5 100644 --- a/libbb/safe_gethostname.c +++ b/libbb/safe_gethostname.c | |||
@@ -45,7 +45,7 @@ char *safe_gethostname(void) | |||
45 | * name and an 8-byte nodename), but this is true on Linux. The same holds | 45 | * name and an 8-byte nodename), but this is true on Linux. The same holds |
46 | * for setdomainname(2) and the domainname field. | 46 | * for setdomainname(2) and the domainname field. |
47 | */ | 47 | */ |
48 | 48 | ||
49 | /* Uname can fail only if you pass a bad pointer to it. */ | 49 | /* Uname can fail only if you pass a bad pointer to it. */ |
50 | uname(&uts); | 50 | uname(&uts); |
51 | 51 | ||
diff --git a/networking/ifenslave.c b/networking/ifenslave.c index 1e3d5bb95..875e835e7 100644 --- a/networking/ifenslave.c +++ b/networking/ifenslave.c | |||
@@ -5,19 +5,19 @@ | |||
5 | * | 5 | * |
6 | * ifenslave.c: Configure network interfaces for parallel routing. | 6 | * ifenslave.c: Configure network interfaces for parallel routing. |
7 | * | 7 | * |
8 | * This program controls the Linux implementation of running multiple | 8 | * This program controls the Linux implementation of running multiple |
9 | * network interfaces in parallel. | 9 | * network interfaces in parallel. |
10 | * | 10 | * |
11 | * Author: Donald Becker <becker@cesdis.gsfc.nasa.gov> | 11 | * Author: Donald Becker <becker@cesdis.gsfc.nasa.gov> |
12 | * Copyright 1994-1996 Donald Becker | 12 | * Copyright 1994-1996 Donald Becker |
13 | * | 13 | * |
14 | * This program is free software; you can redistribute it | 14 | * This program is free software; you can redistribute it |
15 | * and/or modify it under the terms of the GNU General Public | 15 | * and/or modify it under the terms of the GNU General Public |
16 | * License as published by the Free Software Foundation. | 16 | * License as published by the Free Software Foundation. |
17 | * | 17 | * |
18 | * The author may be reached as becker@CESDIS.gsfc.nasa.gov, or C/O | 18 | * The author may be reached as becker@CESDIS.gsfc.nasa.gov, or C/O |
19 | * Center of Excellence in Space Data and Information Sciences | 19 | * Center of Excellence in Space Data and Information Sciences |
20 | * Code 930.5, Goddard Space Flight Center, Greenbelt MD 20771 | 20 | * Code 930.5, Goddard Space Flight Center, Greenbelt MD 20771 |
21 | * | 21 | * |
22 | * Changes : | 22 | * Changes : |
23 | * - 2000/10/02 Willy Tarreau <willy at meta-x.org> : | 23 | * - 2000/10/02 Willy Tarreau <willy at meta-x.org> : |
@@ -79,23 +79,23 @@ | |||
79 | * current version is 1.0.0 as a base line. | 79 | * current version is 1.0.0 as a base line. |
80 | * | 80 | * |
81 | * - 2003/05/22 - Jay Vosburgh <fubar at us dot ibm dot com> | 81 | * - 2003/05/22 - Jay Vosburgh <fubar at us dot ibm dot com> |
82 | * - ifenslave -c was broken; it's now fixed | 82 | * - ifenslave -c was broken; it's now fixed |
83 | * - Fixed problem with routes vanishing from master during enslave | 83 | * - Fixed problem with routes vanishing from master during enslave |
84 | * processing. | 84 | * processing. |
85 | * | 85 | * |
86 | * - 2003/05/27 - Amir Noam <amir.noam at intel dot com> | 86 | * - 2003/05/27 - Amir Noam <amir.noam at intel dot com> |
87 | * - Fix backward compatibility issues: | 87 | * - Fix backward compatibility issues: |
88 | * For drivers not using ABI versions, slave was set down while | 88 | * For drivers not using ABI versions, slave was set down while |
89 | * it should be left up before enslaving. | 89 | * it should be left up before enslaving. |
90 | * Also, master was not set down and the default set_mac_address() | 90 | * Also, master was not set down and the default set_mac_address() |
91 | * would fail and generate an error message in the system log. | 91 | * would fail and generate an error message in the system log. |
92 | * - For opt_c: slave should not be set to the master's setting | 92 | * - For opt_c: slave should not be set to the master's setting |
93 | * while it is running. It was already set during enslave. To | 93 | * while it is running. It was already set during enslave. To |
94 | * simplify things, it is now handeled separately. | 94 | * simplify things, it is now handeled separately. |
95 | * | 95 | * |
96 | * - 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com> | 96 | * - 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com> |
97 | * - Code cleanup and style changes | 97 | * - Code cleanup and style changes |
98 | * set version to 1.1.0 | 98 | * set version to 1.1.0 |
99 | */ | 99 | */ |
100 | 100 | ||
101 | #include "libbb.h" | 101 | #include "libbb.h" |
diff --git a/networking/inetd.c b/networking/inetd.c index 5cdfe0a22..eb19d1630 100644 --- a/networking/inetd.c +++ b/networking/inetd.c | |||
@@ -366,7 +366,7 @@ static len_and_sockaddr *xzalloc_lsa(int family) | |||
366 | lsa = xzalloc(LSA_LEN_SIZE + sz); | 366 | lsa = xzalloc(LSA_LEN_SIZE + sz); |
367 | lsa->len = sz; | 367 | lsa->len = sz; |
368 | lsa->u.sa.sa_family = family; | 368 | lsa->u.sa.sa_family = family; |
369 | return lsa; | 369 | return lsa; |
370 | } | 370 | } |
371 | 371 | ||
372 | static void rearm_alarm(void) | 372 | static void rearm_alarm(void) |
@@ -1357,7 +1357,7 @@ int inetd_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
1357 | /* peek at the packet and remember peer addr */ | 1357 | /* peek at the packet and remember peer addr */ |
1358 | int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT, | 1358 | int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT, |
1359 | &lsa->u.sa, &lsa->len); | 1359 | &lsa->u.sa, &lsa->len); |
1360 | if (r < 0) | 1360 | if (r < 0) |
1361 | goto do_exit1; | 1361 | goto do_exit1; |
1362 | /* make this socket "connected" to peer addr: | 1362 | /* make this socket "connected" to peer addr: |
1363 | * only packets from this peer will be recv'ed, | 1363 | * only packets from this peer will be recv'ed, |
diff --git a/networking/sendmail.c b/networking/sendmail.c index 2218f2c19..378c4bb2e 100644 --- a/networking/sendmail.c +++ b/networking/sendmail.c | |||
@@ -408,7 +408,7 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
408 | 408 | ||
409 | // make a random string -- it will delimit message parts | 409 | // make a random string -- it will delimit message parts |
410 | srand(monotonic_us()); | 410 | srand(monotonic_us()); |
411 | boundary = xasprintf("%d-%d-%d", rand(), rand(), rand()); | 411 | boundary = xasprintf("%d-%d-%d", rand(), rand(), rand()); |
412 | 412 | ||
413 | // put common headers and body start | 413 | // put common headers and body start |
414 | printf( | 414 | printf( |
@@ -457,7 +457,7 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
457 | printf("\r\n--%s--\r\n" "\r\n", boundary); | 457 | printf("\r\n--%s--\r\n" "\r\n", boundary); |
458 | 458 | ||
459 | // leave "put message" mode | 459 | // leave "put message" mode |
460 | smtp_check(".", 250); | 460 | smtp_check(".", 250); |
461 | // ... and say goodbye | 461 | // ... and say goodbye |
462 | smtp_check("QUIT", 221); | 462 | smtp_check("QUIT", 221); |
463 | 463 | ||
@@ -482,7 +482,7 @@ int sendgetmail_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
482 | 482 | ||
483 | // cache postprocess program | 483 | // cache postprocess program |
484 | *fargs = *argv; | 484 | *fargs = *argv; |
485 | 485 | ||
486 | // authenticate | 486 | // authenticate |
487 | if (!(opts & OPT_U)) { | 487 | if (!(opts & OPT_U)) { |
488 | //opts |= OPT_U; | 488 | //opts |= OPT_U; |
diff --git a/printutils/lpd.c b/printutils/lpd.c index bc0348eba..4008e4396 100644 --- a/printutils/lpd.c +++ b/printutils/lpd.c | |||
@@ -18,13 +18,13 @@ | |||
18 | * and should have the following structure: | 18 | * and should have the following structure: |
19 | * | 19 | * |
20 | * SPOOLDIR/ | 20 | * SPOOLDIR/ |
21 | * <queue1> | 21 | * <queue1> |
22 | * ... | 22 | * ... |
23 | * <queueN> | 23 | * <queueN> |
24 | * | 24 | * |
25 | * <queueX> can be of two types: | 25 | * <queueX> can be of two types: |
26 | * A. a printer character device or an ordinary file a link to such; | 26 | * A. a printer character device or an ordinary file a link to such; |
27 | * B. a directory. | 27 | * B. a directory. |
28 | * | 28 | * |
29 | * In case A lpd just dumps the data it receives from client (lpr) to the | 29 | * In case A lpd just dumps the data it receives from client (lpr) to the |
30 | * end of queue file/device. This is non-spooling mode. | 30 | * end of queue file/device. This is non-spooling mode. |
@@ -38,11 +38,11 @@ | |||
38 | * lpd only sanitizes them (by removing most non-alphanumerics). | 38 | * lpd only sanitizes them (by removing most non-alphanumerics). |
39 | * | 39 | * |
40 | * If HELPER-PROG (with optional arguments) is specified then lpd continues to process client data: | 40 | * If HELPER-PROG (with optional arguments) is specified then lpd continues to process client data: |
41 | * 1. it reads and parses control file (cfA...). The parse process results in setting environment | 41 | * 1. it reads and parses control file (cfA...). The parse process results in setting environment |
42 | * variables whose values were passed in control file; when parsing is complete, lpd deletes | 42 | * variables whose values were passed in control file; when parsing is complete, lpd deletes |
43 | * control file. | 43 | * control file. |
44 | * 2. it spawns specified helper application. It is then the helper application who is responsible | 44 | * 2. it spawns specified helper application. It is then the helper application who is responsible |
45 | * for both actual printing and deleting processed data file. | 45 | * for both actual printing and deleting processed data file. |
46 | * | 46 | * |
47 | * A good lpr passes control files which when parsed provide the following variables: | 47 | * A good lpr passes control files which when parsed provide the following variables: |
48 | * $H = host which issues the job | 48 | * $H = host which issues the job |
diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 763e2f2d7..23bd9ff10 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host | |||
@@ -99,7 +99,7 @@ hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags) | |||
99 | # host-csingle -> Executable | 99 | # host-csingle -> Executable |
100 | quiet_cmd_host-csingle = HOSTCC $@ | 100 | quiet_cmd_host-csingle = HOSTCC $@ |
101 | cmd_host-csingle = $(HOSTCC) $(hostc_flags) -o $@ $< \ | 101 | cmd_host-csingle = $(HOSTCC) $(hostc_flags) -o $@ $< \ |
102 | $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) | 102 | $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) |
103 | $(host-csingle): %: %.c FORCE | 103 | $(host-csingle): %: %.c FORCE |
104 | $(call if_changed_dep,host-csingle) | 104 | $(call if_changed_dep,host-csingle) |
105 | 105 | ||
diff --git a/shell/msh.c b/shell/msh.c index cd4695454..fd4a54117 100644 --- a/shell/msh.c +++ b/shell/msh.c | |||
@@ -159,7 +159,7 @@ static int mshdbg_rc = 0; | |||
159 | /* | 159 | /* |
160 | * library and system definitions | 160 | * library and system definitions |
161 | */ | 161 | */ |
162 | typedef void xint; /* base type of jmp_buf, for not broken compilers */ | 162 | typedef void xint; /* base type of jmp_buf, for not broken compilers */ |
163 | 163 | ||
164 | /* | 164 | /* |
165 | * shell components | 165 | * shell components |
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c index 779971cc9..9ab1cef02 100644 --- a/util-linux/volume_id/fat.c +++ b/util-linux/volume_id/fat.c | |||
@@ -181,7 +181,7 @@ int volume_id_probe_vfat(struct volume_id *id, uint64_t off) | |||
181 | if (vs->heads == 0) | 181 | if (vs->heads == 0) |
182 | return -1; | 182 | return -1; |
183 | 183 | ||
184 | /* cluster size check*/ | 184 | /* cluster size check */ |
185 | if (vs->sectors_per_cluster == 0 || | 185 | if (vs->sectors_per_cluster == 0 || |
186 | (vs->sectors_per_cluster & (vs->sectors_per_cluster-1))) | 186 | (vs->sectors_per_cluster & (vs->sectors_per_cluster-1))) |
187 | return -1; | 187 | return -1; |
diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c index ba76876b5..c666b86b8 100644 --- a/util-linux/volume_id/unused_ufs.c +++ b/util-linux/volume_id/unused_ufs.c | |||
@@ -32,13 +32,13 @@ struct ufs_super_block { | |||
32 | uint32_t fs_time; | 32 | uint32_t fs_time; |
33 | uint32_t fs_size; | 33 | uint32_t fs_size; |
34 | uint32_t fs_dsize; | 34 | uint32_t fs_dsize; |
35 | uint32_t fs_ncg; | 35 | uint32_t fs_ncg; |
36 | uint32_t fs_bsize; | 36 | uint32_t fs_bsize; |
37 | uint32_t fs_fsize; | 37 | uint32_t fs_fsize; |
38 | uint32_t fs_frag; | 38 | uint32_t fs_frag; |
39 | uint32_t fs_minfree; | 39 | uint32_t fs_minfree; |
40 | uint32_t fs_rotdelay; | 40 | uint32_t fs_rotdelay; |
41 | uint32_t fs_rps; | 41 | uint32_t fs_rps; |
42 | uint32_t fs_bmask; | 42 | uint32_t fs_bmask; |
43 | uint32_t fs_fmask; | 43 | uint32_t fs_fmask; |
44 | uint32_t fs_bshift; | 44 | uint32_t fs_bshift; |
@@ -63,7 +63,7 @@ struct ufs_super_block { | |||
63 | uint32_t fs_cgsize; | 63 | uint32_t fs_cgsize; |
64 | uint32_t fs_ntrak; | 64 | uint32_t fs_ntrak; |
65 | uint32_t fs_nsect; | 65 | uint32_t fs_nsect; |
66 | uint32_t fs_spc; | 66 | uint32_t fs_spc; |
67 | uint32_t fs_ncyl; | 67 | uint32_t fs_ncyl; |
68 | uint32_t fs_cpg; | 68 | uint32_t fs_cpg; |
69 | uint32_t fs_ipg; | 69 | uint32_t fs_ipg; |
@@ -95,7 +95,7 @@ struct ufs_super_block { | |||
95 | uint32_t fs_cgrotor; | 95 | uint32_t fs_cgrotor; |
96 | uint32_t fs_ocsp[28]; | 96 | uint32_t fs_ocsp[28]; |
97 | uint32_t fs_contigdirs; | 97 | uint32_t fs_contigdirs; |
98 | uint32_t fs_csp; | 98 | uint32_t fs_csp; |
99 | uint32_t fs_maxcluster; | 99 | uint32_t fs_maxcluster; |
100 | uint32_t fs_active; | 100 | uint32_t fs_active; |
101 | int32_t fs_old_cpc; | 101 | int32_t fs_old_cpc; |
@@ -172,7 +172,7 @@ int volume_id_probe_ufs(struct volume_id *id, uint64_t off) | |||
172 | 172 | ||
173 | dbg("probing at offset 0x%llx", (unsigned long long) off); | 173 | dbg("probing at offset 0x%llx", (unsigned long long) off); |
174 | 174 | ||
175 | for (i = 0; i < ARRAY_SIZE(offsets); i++) { | 175 | for (i = 0; i < ARRAY_SIZE(offsets); i++) { |
176 | ufs = volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800); | 176 | ufs = volume_id_get_buffer(id, off + (offsets[i] * 0x400), 0x800); |
177 | if (ufs == NULL) | 177 | if (ufs == NULL) |
178 | return -1; | 178 | return -1; |