diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-01 11:24:04 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-01 11:24:04 +0000 |
commit | 3266aa9ec285dbcf254daa17c103bf69dc755967 (patch) | |
tree | 265f69a3085b0d712d355580d768242734e5951a | |
parent | 88b8f0a3475fc1f2e1b3cf58b63902551dae0169 (diff) | |
download | busybox-w32-3266aa9ec285dbcf254daa17c103bf69dc755967.tar.gz busybox-w32-3266aa9ec285dbcf254daa17c103bf69dc755967.tar.bz2 busybox-w32-3266aa9ec285dbcf254daa17c103bf69dc755967.zip |
trailing whitespace removal
-rw-r--r-- | archival/libunarchive/get_header_tar.c | 2 | ||||
-rw-r--r-- | docs/busybox.net/svnindex.xsl | 6 | ||||
-rw-r--r-- | editors/vi.c | 4 | ||||
-rw-r--r-- | findutils/grep.c | 2 | ||||
-rw-r--r-- | include/libbb.h | 2 | ||||
-rw-r--r-- | loginutils/login.c | 2 | ||||
-rw-r--r-- | miscutils/ionice.c | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c index 0280bbc91..443052f7e 100644 --- a/archival/libunarchive/get_header_tar.c +++ b/archival/libunarchive/get_header_tar.c | |||
@@ -48,7 +48,7 @@ static off_t getBase256_len12(const char *str) | |||
48 | while (1) { | 48 | while (1) { |
49 | if (c) | 49 | if (c) |
50 | bb_error_msg_and_die("overflow in base-256 encoded file size"); | 50 | bb_error_msg_and_die("overflow in base-256 encoded file size"); |
51 | if (--len == sizeof(off_t)) | 51 | if (--len == sizeof(off_t)) |
52 | break; | 52 | break; |
53 | c = *str++; | 53 | c = *str++; |
54 | } | 54 | } |
diff --git a/docs/busybox.net/svnindex.xsl b/docs/busybox.net/svnindex.xsl index b4cc5f993..2d3297c4c 100644 --- a/docs/busybox.net/svnindex.xsl +++ b/docs/busybox.net/svnindex.xsl | |||
@@ -25,9 +25,9 @@ | |||
25 | <div class="header" style="font-family: lucida, helvetica; font-size: 248%"> | 25 | <div class="header" style="font-family: lucida, helvetica; font-size: 248%"> |
26 | <xsl:text>BUSYBOX</xsl:text> | 26 | <xsl:text>BUSYBOX</xsl:text> |
27 | </div> | 27 | </div> |
28 | <div class="header"> | 28 | <div class="header"> |
29 | <a href="http://www.busybox.net"><img src="/images/busybox1.png" border="0" /></a> | 29 | <a href="http://www.busybox.net"><img src="/images/busybox1.png" border="0" /></a> |
30 | </div> | 30 | </div> |
31 | <div class="svn"> | 31 | <div class="svn"> |
32 | <xsl:apply-templates/> | 32 | <xsl:apply-templates/> |
33 | </div> | 33 | </div> |
diff --git a/editors/vi.c b/editors/vi.c index 7f5f2dcbc..0497bc251 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -1677,12 +1677,12 @@ static char *char_insert(char *p, char c) // insert the char c at 'p' | |||
1677 | q = prev_line(p); // use prev line as template | 1677 | q = prev_line(p); // use prev line as template |
1678 | len = strspn(q, " \t"); // space or tab | 1678 | len = strspn(q, " \t"); // space or tab |
1679 | if (len) { | 1679 | if (len) { |
1680 | uintptr_t bias; | 1680 | uintptr_t bias; |
1681 | bias = text_hole_make(p, len); | 1681 | bias = text_hole_make(p, len); |
1682 | p += bias; | 1682 | p += bias; |
1683 | q += bias; | 1683 | q += bias; |
1684 | memcpy(p, q, len); | 1684 | memcpy(p, q, len); |
1685 | p += len; | 1685 | p += len; |
1686 | } | 1686 | } |
1687 | } | 1687 | } |
1688 | #endif | 1688 | #endif |
diff --git a/findutils/grep.c b/findutils/grep.c index 723c3511a..e23f9bcf3 100644 --- a/findutils/grep.c +++ b/findutils/grep.c | |||
@@ -30,7 +30,7 @@ | |||
30 | USE_DESKTOP("w") \ | 30 | USE_DESKTOP("w") \ |
31 | USE_EXTRA_COMPAT("z") \ | 31 | USE_EXTRA_COMPAT("z") \ |
32 | "aI" | 32 | "aI" |
33 | 33 | ||
34 | /* ignored: -a "assume all files to be text" */ | 34 | /* ignored: -a "assume all files to be text" */ |
35 | /* ignored: -I "assume binary files have no matches" */ | 35 | /* ignored: -I "assume binary files have no matches" */ |
36 | 36 | ||
diff --git a/include/libbb.h b/include/libbb.h index c2e034447..74ec678d8 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1301,7 +1301,7 @@ enum { | |||
1301 | PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL | 1301 | PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL |
1302 | || ENABLE_PGREP || ENABLE_PKILL | 1302 | || ENABLE_PGREP || ENABLE_PKILL |
1303 | || ENABLE_PIDOF | 1303 | || ENABLE_PIDOF |
1304 | || ENABLE_SESTATUS | 1304 | || ENABLE_SESTATUS |
1305 | ), | 1305 | ), |
1306 | USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) | 1306 | USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) |
1307 | PSSCAN_START_TIME = 1 << 18, | 1307 | PSSCAN_START_TIME = 1 << 18, |
diff --git a/loginutils/login.c b/loginutils/login.c index b7b9ee1d8..d57d529c0 100644 --- a/loginutils/login.c +++ b/loginutils/login.c | |||
@@ -465,7 +465,7 @@ int login_main(int argc UNUSED_PARAM, char **argv) | |||
465 | fchmod(0, 0600); | 465 | fchmod(0, 0600); |
466 | 466 | ||
467 | /* We trust environment only if we run by root */ | 467 | /* We trust environment only if we run by root */ |
468 | if (ENABLE_LOGIN_SCRIPTS && run_by_root) | 468 | if (ENABLE_LOGIN_SCRIPTS && run_by_root) |
469 | run_login_script(pw, full_tty); | 469 | run_login_script(pw, full_tty); |
470 | 470 | ||
471 | change_identity(pw); | 471 | change_identity(pw); |
diff --git a/miscutils/ionice.c b/miscutils/ionice.c index 88d771c30..361c141b8 100644 --- a/miscutils/ionice.c +++ b/miscutils/ionice.c | |||
@@ -57,7 +57,7 @@ int ionice_main(int argc UNUSED_PARAM, char **argv) | |||
57 | /* '+': stop at first non-option */ | 57 | /* '+': stop at first non-option */ |
58 | opt = getopt32(argv, "+n:c:p:", &pri, &ioclass, &pid); | 58 | opt = getopt32(argv, "+n:c:p:", &pri, &ioclass, &pid); |
59 | argv += optind; | 59 | argv += optind; |
60 | 60 | ||
61 | if (opt & OPT_c) { | 61 | if (opt & OPT_c) { |
62 | if (ioclass > 3) | 62 | if (ioclass > 3) |
63 | bb_error_msg_and_die("bad class %d", ioclass); | 63 | bb_error_msg_and_die("bad class %d", ioclass); |
@@ -70,7 +70,7 @@ int ionice_main(int argc UNUSED_PARAM, char **argv) | |||
70 | // pri = 7; | 70 | // pri = 7; |
71 | // } | 71 | // } |
72 | } | 72 | } |
73 | 73 | ||
74 | if (!(opt & (OPT_n|OPT_c))) { | 74 | if (!(opt & (OPT_n|OPT_c))) { |
75 | if (!(opt & OPT_p) && *argv) | 75 | if (!(opt & OPT_p) && *argv) |
76 | pid = xatoi_u(*argv); | 76 | pid = xatoi_u(*argv); |