aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-07-15 20:02:19 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-07-15 20:02:19 +0200
commit9038d6f8f50b59951a9dc3345cf7c8910f954c4a (patch)
tree3f7ab137e0993e5da6ef25c90d92966e4256700e
parent7dd0ce49531b6340950b4a3eedbef1c958a475d9 (diff)
downloadbusybox-w32-9038d6f8f50b59951a9dc3345cf7c8910f954c4a.tar.gz
busybox-w32-9038d6f8f50b59951a9dc3345cf7c8910f954c4a.tar.bz2
busybox-w32-9038d6f8f50b59951a9dc3345cf7c8910f954c4a.zip
remove trailing whitespace
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/lzo1x_9x.c2
-rw-r--r--archival/lzop.c6
-rw-r--r--libbb/lineedit.c2
-rw-r--r--networking/hostname.c2
-rw-r--r--networking/udhcp/packet.c2
-rw-r--r--shell/hush.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/archival/lzo1x_9x.c b/archival/lzo1x_9x.c
index d30e2e7d1..f2d4fac1b 100644
--- a/archival/lzo1x_9x.c
+++ b/archival/lzo1x_9x.c
@@ -304,7 +304,7 @@ static void swd_search(lzo_swd_p s, unsigned node, unsigned cnt)
304 p2[1] == p1[1]) { 304 p2[1] == p1[1]) {
305 unsigned i; 305 unsigned i;
306 assert(lzo_memcmp(bp,&b[node],3) == 0); 306 assert(lzo_memcmp(bp,&b[node],3) == 0);
307 307
308 p1 += 2; p2 += 2; 308 p1 += 2; p2 += 2;
309 do {} while (++p1 < px && *p1 == *++p2); 309 do {} while (++p1 < px && *p1 == *++p2);
310 i = p1-bp; 310 i = p1-bp;
diff --git a/archival/lzop.c b/archival/lzop.c
index a30d5e78b..b4757e86d 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -856,7 +856,7 @@ static const unsigned char lzop_magic[9] = {
856/* This coding is derived from Alexander Lehmann's pngcheck code. */ 856/* This coding is derived from Alexander Lehmann's pngcheck code. */
857static void check_magic(void) 857static void check_magic(void)
858{ 858{
859 unsigned char magic[sizeof(lzop_magic)]; 859 unsigned char magic[sizeof(lzop_magic)];
860 xread(0, magic, sizeof(magic)); 860 xread(0, magic, sizeof(magic));
861 if (memcmp(magic, lzop_magic, sizeof(lzop_magic)) != 0) 861 if (memcmp(magic, lzop_magic, sizeof(lzop_magic)) != 0)
862 bb_error_msg_and_die("bad magic number"); 862 bb_error_msg_and_die("bad magic number");
@@ -948,7 +948,7 @@ static int read_header(header_t *h)
948 /* skip extra field [not used yet] */ 948 /* skip extra field [not used yet] */
949 if (h->flags & F_H_EXTRA_FIELD) { 949 if (h->flags & F_H_EXTRA_FIELD) {
950 uint32_t k; 950 uint32_t k;
951 951
952 /* note: the checksum also covers the length */ 952 /* note: the checksum also covers the length */
953 init_chksum(&G.chksum_in); 953 init_chksum(&G.chksum_in);
954 h->extra_field_len = f_read32(); 954 h->extra_field_len = f_read32();
@@ -1033,7 +1033,7 @@ static smallint do_lzo_compress(void)
1033static smallint do_lzo_decompress(void) 1033static smallint do_lzo_decompress(void)
1034{ 1034{
1035 header_t header; 1035 header_t header;
1036 1036
1037 check_magic(); 1037 check_magic();
1038 p_header(&header); 1038 p_header(&header);
1039 return lzo_decompress(&header); 1039 return lzo_decompress(&header);
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 5ebea70d6..a99f9b5fd 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -233,7 +233,7 @@ static size_t load_string(const char *src, int maxsize)
233 safe_strncpy(command_ps, src, maxsize); 233 safe_strncpy(command_ps, src, maxsize);
234 return strlen(command_ps); 234 return strlen(command_ps);
235} 235}
236# if ENABLE_FEATURE_TAB_COMPLETION 236# if ENABLE_FEATURE_TAB_COMPLETION
237static void save_string(char *dst, int maxsize) 237static void save_string(char *dst, int maxsize)
238{ 238{
239 safe_strncpy(dst, command_ps, maxsize); 239 safe_strncpy(dst, command_ps, maxsize);
diff --git a/networking/hostname.c b/networking/hostname.c
index 7a120fa2c..579eff795 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -31,7 +31,7 @@ static void do_sethostname(char *s, int isfile)
31 31
32/* Manpage circa 2009: 32/* Manpage circa 2009:
33 * 33 *
34 * hostname [-v] [-a] [--alias] [-d] [--domain] [-f] [--fqdn] [--long] 34 * hostname [-v] [-a] [--alias] [-d] [--domain] [-f] [--fqdn] [--long]
35 * [-i] [--ip-address] [-s] [--short] [-y] [--yp] [--nis] 35 * [-i] [--ip-address] [-s] [--short] [-y] [--yp] [--nis]
36 * 36 *
37 * hostname [-v] [-F filename] [--file filename] / [hostname] 37 * hostname [-v] [-F filename] [--file filename] / [hostname]
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 4c72d7a63..90410cbc0 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -53,7 +53,7 @@ void FAST_FUNC udhcp_dump_packet(struct dhcp_packet *packet)
53 //" secs %x" 53 //" secs %x"
54 //" flags %x" 54 //" flags %x"
55 " ciaddr %x" 55 " ciaddr %x"
56 " yiaddr %x" 56 " yiaddr %x"
57 " siaddr %x" 57 " siaddr %x"
58 " giaddr %x" 58 " giaddr %x"
59 //" chaddr %s" 59 //" chaddr %s"
diff --git a/shell/hush.c b/shell/hush.c
index fe05e4715..d7b479d64 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7207,7 +7207,7 @@ static int FAST_FUNC builtin_memleak(char **argv UNUSED_PARAM)
7207 7207
7208 if (!G.memleak_value) 7208 if (!G.memleak_value)
7209 G.memleak_value = l; 7209 G.memleak_value = l;
7210 7210
7211 l -= G.memleak_value; 7211 l -= G.memleak_value;
7212 if ((long)l < 0) 7212 if ((long)l < 0)
7213 l = 0; 7213 l = 0;