aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-10-14 04:55:59 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-10-14 04:55:59 +0000
commit3f5fdc7572d932f33f81029956b87230c9b05182 (patch)
tree13e8b0c3dc4c11fe0ac09affef497075177cd648
parentbe039374f3bd1c76535387ac4d079506804be270 (diff)
downloadbusybox-w32-3f5fdc7572d932f33f81029956b87230c9b05182.tar.gz
busybox-w32-3f5fdc7572d932f33f81029956b87230c9b05182.tar.bz2
busybox-w32-3f5fdc7572d932f33f81029956b87230c9b05182.zip
remove trailing whitespace
-rw-r--r--archival/bz/LICENSE10
-rw-r--r--archival/bz/README22
-rw-r--r--archival/bz/bzlib.c2
-rw-r--r--archival/bz/compress.c2
-rw-r--r--archival/bz/huffman.c4
-rw-r--r--ipsvd/tcpudp.c2
-rw-r--r--libbb/messages.c2
-rw-r--r--networking/httpd.c8
-rw-r--r--networking/nameif.c2
-rw-r--r--selinux/Config.in2
-rw-r--r--util-linux/mount.c2
11 files changed, 29 insertions, 29 deletions
diff --git a/archival/bz/LICENSE b/archival/bz/LICENSE
index f01f08022..da4346520 100644
--- a/archival/bz/LICENSE
+++ b/archival/bz/LICENSE
@@ -15,16 +15,16 @@ are met:
151. Redistributions of source code must retain the above copyright 151. Redistributions of source code must retain the above copyright
16 notice, this list of conditions and the following disclaimer. 16 notice, this list of conditions and the following disclaimer.
17 17
182. The origin of this software must not be misrepresented; you must 182. The origin of this software must not be misrepresented; you must
19 not claim that you wrote the original software. If you use this 19 not claim that you wrote the original software. If you use this
20 software in a product, an acknowledgment in the product 20 software in a product, an acknowledgment in the product
21 documentation would be appreciated but is not required. 21 documentation would be appreciated but is not required.
22 22
233. Altered source versions must be plainly marked as such, and must 233. Altered source versions must be plainly marked as such, and must
24 not be misrepresented as being the original software. 24 not be misrepresented as being the original software.
25 25
264. The name of the author may not be used to endorse or promote 264. The name of the author may not be used to endorse or promote
27 products derived from this software without specific prior written 27 products derived from this software without specific prior written
28 permission. 28 permission.
29 29
30THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 30THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
diff --git a/archival/bz/README b/archival/bz/README
index ef06d67da..3015342cb 100644
--- a/archival/bz/README
+++ b/archival/bz/README
@@ -25,12 +25,12 @@ Please read and be aware of the following:
25 25
26WARNING: 26WARNING:
27 27
28 This program and library (attempts to) compress data by 28 This program and library (attempts to) compress data by
29 performing several non-trivial transformations on it. 29 performing several non-trivial transformations on it.
30 Unless you are 100% familiar with *all* the algorithms 30 Unless you are 100% familiar with *all* the algorithms
31 contained herein, and with the consequences of modifying them, 31 contained herein, and with the consequences of modifying them,
32 you should NOT meddle with the compression or decompression 32 you should NOT meddle with the compression or decompression
33 machinery. Incorrect changes can and very likely *will* 33 machinery. Incorrect changes can and very likely *will*
34 lead to disastrous loss of data. 34 lead to disastrous loss of data.
35 35
36 36
@@ -50,16 +50,16 @@ DISCLAIMER:
50 PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER 50 PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
51 SMALL, THAT THE DATA WILL NOT BE RECOVERABLE. 51 SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
52 52
53 That is not to say this program is inherently unreliable. 53 That is not to say this program is inherently unreliable.
54 Indeed, I very much hope the opposite is true. bzip2/libbzip2 54 Indeed, I very much hope the opposite is true. bzip2/libbzip2
55 has been carefully constructed and extensively tested. 55 has been carefully constructed and extensively tested.
56 56
57 57
58PATENTS: 58PATENTS:
59 59
60 To the best of my knowledge, bzip2/libbzip2 does not use any 60 To the best of my knowledge, bzip2/libbzip2 does not use any
61 patented algorithms. However, I do not have the resources 61 patented algorithms. However, I do not have the resources
62 to carry out a patent search. Therefore I cannot give any 62 to carry out a patent search. Therefore I cannot give any
63 guarantee of the above statement. 63 guarantee of the above statement.
64 64
65 65
diff --git a/archival/bz/bzlib.c b/archival/bz/bzlib.c
index 57a69747e..f27050a3c 100644
--- a/archival/bz/bzlib.c
+++ b/archival/bz/bzlib.c
@@ -259,7 +259,7 @@ void /*Bool*/ handle_compress(bz_stream *strm)
259 /*Bool progress_in = False;*/ 259 /*Bool progress_in = False;*/
260 /*Bool progress_out = False;*/ 260 /*Bool progress_out = False;*/
261 EState* s = strm->state; 261 EState* s = strm->state;
262 262
263 while (1) { 263 while (1) {
264 if (s->state == BZ_S_OUTPUT) { 264 if (s->state == BZ_S_OUTPUT) {
265 /*progress_out |=*/ copy_output_until_stop(s); 265 /*progress_out |=*/ copy_output_until_stop(s);
diff --git a/archival/bz/compress.c b/archival/bz/compress.c
index 4bd364ee3..3e2fbd867 100644
--- a/archival/bz/compress.c
+++ b/archival/bz/compress.c
@@ -414,7 +414,7 @@ void sendMTFValues(EState* s)
414 /* 414 /*
415 * Increment the symbol frequencies for the selected table. 415 * Increment the symbol frequencies for the selected table.
416 */ 416 */
417/* 1% faster compress. +800 bytes */ 417/* 1% faster compress. +800 bytes */
418#if CONFIG_BZIP2_FEATURE_SPEED >= 4 418#if CONFIG_BZIP2_FEATURE_SPEED >= 4
419 if (nGroups == 6 && 50 == ge-gs+1) { 419 if (nGroups == 6 && 50 == ge-gs+1) {
420 /*--- fast track the common case ---*/ 420 /*--- fast track the common case ---*/
diff --git a/archival/bz/huffman.c b/archival/bz/huffman.c
index f016c968c..3f80c9976 100644
--- a/archival/bz/huffman.c
+++ b/archival/bz/huffman.c
@@ -133,7 +133,7 @@ void BZ2_hbMakeCodeLengths(uint8_t *len,
133 } 133 }
134 134
135 AssertH(nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001); 135 AssertH(nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001);
136 136
137 while (nHeap > 1) { 137 while (nHeap > 1) {
138 n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP1(heap, weight, nHeap); 138 n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP1(heap, weight, nHeap);
139 n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP1(heap, weight, nHeap); 139 n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP1(heap, weight, nHeap);
@@ -160,7 +160,7 @@ void BZ2_hbMakeCodeLengths(uint8_t *len,
160 if (j > maxLen) 160 if (j > maxLen)
161 tooLong = True; 161 tooLong = True;
162 } 162 }
163 163
164 if (!tooLong) 164 if (!tooLong)
165 break; 165 break;
166 166
diff --git a/ipsvd/tcpudp.c b/ipsvd/tcpudp.c
index 98b075ff1..fc29274d2 100644
--- a/ipsvd/tcpudp.c
+++ b/ipsvd/tcpudp.c
@@ -45,7 +45,7 @@ struct globals {
45 unsigned max_per_host; 45 unsigned max_per_host;
46 unsigned cur_per_host; 46 unsigned cur_per_host;
47 unsigned cnum; 47 unsigned cnum;
48 unsigned cmax; 48 unsigned cmax;
49}; 49};
50#define G (*(struct globals*)&bb_common_bufsiz1) 50#define G (*(struct globals*)&bb_common_bufsiz1)
51#define verbose (G.verbose ) 51#define verbose (G.verbose )
diff --git a/libbb/messages.c b/libbb/messages.c
index 06e9a588a..2a011f815 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -47,7 +47,7 @@ const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH;
47const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL; 47const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL;
48/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin, 48/* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
49 * but I want to save a few bytes here. Check libbb.h before changing! */ 49 * but I want to save a few bytes here. Check libbb.h before changing! */
50const char bb_PATH_root_path[] ALIGN1 = 50const char bb_PATH_root_path[] ALIGN1 =
51 "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH; 51 "PATH=/sbin:/usr/sbin:/bin:/usr/bin" BB_ADDITIONAL_PATH;
52 52
53 53
diff --git a/networking/httpd.c b/networking/httpd.c
index 82755a08a..920702141 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -175,7 +175,7 @@ static const uint16_t http_response_type[] ALIGN2 = {
175 HTTP_MOVED_TEMPORARILY, 175 HTTP_MOVED_TEMPORARILY,
176 HTTP_REQUEST_TIMEOUT, 176 HTTP_REQUEST_TIMEOUT,
177 HTTP_NOT_IMPLEMENTED, 177 HTTP_NOT_IMPLEMENTED,
178#if ENABLE_FEATURE_HTTPD_BASIC_AUTH 178#if ENABLE_FEATURE_HTTPD_BASIC_AUTH
179 HTTP_UNAUTHORIZED, 179 HTTP_UNAUTHORIZED,
180#endif 180#endif
181 HTTP_NOT_FOUND, 181 HTTP_NOT_FOUND,
@@ -1405,7 +1405,7 @@ static void send_cgi_and_exit(
1405 1405
1406/* 1406/*
1407 * Send a file response to a HTTP request, and exit 1407 * Send a file response to a HTTP request, and exit
1408 * 1408 *
1409 * Parameters: 1409 * Parameters:
1410 * const char *url The requested URL (with leading /). 1410 * const char *url The requested URL (with leading /).
1411 * headers Don't send headers before if FALSE. 1411 * headers Don't send headers before if FALSE.
@@ -1992,7 +1992,7 @@ static void mini_httpd(int server_socket)
1992 while (1) { 1992 while (1) {
1993 int n; 1993 int n;
1994 len_and_sockaddr fromAddr; 1994 len_and_sockaddr fromAddr;
1995 1995
1996 /* Wait for connections... */ 1996 /* Wait for connections... */
1997 fromAddr.len = LSA_SIZEOF_SA; 1997 fromAddr.len = LSA_SIZEOF_SA;
1998 n = accept(server_socket, &fromAddr.sa, &fromAddr.len); 1998 n = accept(server_socket, &fromAddr.sa, &fromAddr.len);
@@ -2037,7 +2037,7 @@ static void mini_httpd_nommu(int server_socket, int argc, char **argv)
2037 while (1) { 2037 while (1) {
2038 int n; 2038 int n;
2039 len_and_sockaddr fromAddr; 2039 len_and_sockaddr fromAddr;
2040 2040
2041 /* Wait for connections... */ 2041 /* Wait for connections... */
2042 fromAddr.len = LSA_SIZEOF_SA; 2042 fromAddr.len = LSA_SIZEOF_SA;
2043 n = accept(server_socket, &fromAddr.sa, &fromAddr.len); 2043 n = accept(server_socket, &fromAddr.sa, &fromAddr.len);
diff --git a/networking/nameif.c b/networking/nameif.c
index 0369c0807..a951970c2 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -4,7 +4,7 @@
4 * 4 *
5 * Written 2000 by Andi Kleen. 5 * Written 2000 by Andi Kleen.
6 * Busybox port 2002 by Nick Fedchik <nick@fedchik.org.ua> 6 * Busybox port 2002 by Nick Fedchik <nick@fedchik.org.ua>
7 * Glenn McGrath 7 * Glenn McGrath
8 * 8 *
9 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. 9 * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
10 */ 10 */
diff --git a/selinux/Config.in b/selinux/Config.in
index c2fc08dbf..c9b48fb1b 100644
--- a/selinux/Config.in
+++ b/selinux/Config.in
@@ -109,7 +109,7 @@ config SETSEBOOL
109 default n 109 default n
110 depends on SELINUX 110 depends on SELINUX
111 help 111 help
112 Enable support for change boolean. 112 Enable support for change boolean.
113 semanage and -P option is not supported yet. 113 semanage and -P option is not supported yet.
114 114
115endmenu 115endmenu
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 7c58aefb9..fee2f6ee0 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -675,7 +675,7 @@ find_kernel_nfs_mount_version(void)
675 } 675 }
676} 676}
677 677
678static void 678static void
679get_mountport(struct pmap *pm_mnt, 679get_mountport(struct pmap *pm_mnt,
680 struct sockaddr_in *server_addr, 680 struct sockaddr_in *server_addr,
681 long unsigned prog, 681 long unsigned prog,