summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-07-17 21:42:59 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-07-17 21:42:59 +0000
commit49a128a1565520069737ae9602155d8627d7c84c (patch)
treeb1d76d8d1976dbd0cf6e2ef9c61976aadd464ed1
parent150d2fa114d626761a67e529959433226793e733 (diff)
downloadbusybox-w32-49a128a1565520069737ae9602155d8627d7c84c.tar.gz
busybox-w32-49a128a1565520069737ae9602155d8627d7c84c.tar.bz2
busybox-w32-49a128a1565520069737ae9602155d8627d7c84c.zip
remove accumulated stray trailing whitespace
-rw-r--r--editors/vi.c4
-rw-r--r--include/usage.h2
-rw-r--r--libbb/procps.c2
-rw-r--r--miscutils/devfsd.c6
-rw-r--r--miscutils/hdparm.c2
-rw-r--r--networking/pscan.c2
-rw-r--r--networking/udhcp/leases.c2
-rw-r--r--networking/udhcp/socket.c2
8 files changed, 11 insertions, 11 deletions
diff --git a/editors/vi.c b/editors/vi.c
index fda29acfb..fcd139310 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -426,7 +426,7 @@ static void edit_file(char * fn)
426 if (fn != 0) { 426 if (fn != 0) {
427 ch = file_insert(fn, text); 427 ch = file_insert(fn, text);
428 update_ro_status(fn); 428 update_ro_status(fn);
429 } 429 }
430 if (ch < 1) { 430 if (ch < 1) {
431 char_insert(text, '\n'); // start empty buf with dummy line 431 char_insert(text, '\n'); // start empty buf with dummy line
432 } 432 }
@@ -2404,7 +2404,7 @@ static int file_size(const char * fn) // what is the byte size of "fn"
2404 return cnt; 2404 return cnt;
2405} 2405}
2406 2406
2407static int file_insert(char * fn, char * p) 2407static int file_insert(char *fn, char *p)
2408{ 2408{
2409 int cnt = -1; 2409 int cnt = -1;
2410 int fd, size; 2410 int fd, size;
diff --git a/include/usage.h b/include/usage.h
index bd9cb9908..81773bd95 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -3005,7 +3005,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when
3005 "\n -m Do NOT initialize the line in raw 8 bits mode" \ 3005 "\n -m Do NOT initialize the line in raw 8 bits mode" \
3006 "\n -L Enable 3-wire operation" \ 3006 "\n -L Enable 3-wire operation" \
3007 "\n -F Disable RTS/CTS flow control" \ 3007 "\n -F Disable RTS/CTS flow control" \
3008 3008
3009#define sleep_trivial_usage \ 3009#define sleep_trivial_usage \
3010 USE_FEATURE_FANCY_SLEEP("[") "N" USE_FEATURE_FANCY_SLEEP("]...") 3010 USE_FEATURE_FANCY_SLEEP("[") "N" USE_FEATURE_FANCY_SLEEP("]...")
3011#define sleep_full_usage \ 3011#define sleep_full_usage \
diff --git a/libbb/procps.c b/libbb/procps.c
index 1987e98fd..9817a1288 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -5,7 +5,7 @@
5 * Copyright 1998 by Albert Cahalan; all rights reserved. 5 * Copyright 1998 by Albert Cahalan; all rights reserved.
6 * Copyright (C) 2002 by Vladimir Oleynik <dzo@simtreas.ru> 6 * Copyright (C) 2002 by Vladimir Oleynik <dzo@simtreas.ru>
7 * SELinux support: (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp> 7 * SELinux support: (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp>
8 * 8 *
9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
10 */ 10 */
11 11
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 1dfbadf83..49eee9be4 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -689,9 +689,9 @@ static void service_name(const struct devfsd_notify_struct *info)
689 msg_logger(LOG_ERR, "lost %u events", info->overrun_count); 689 msg_logger(LOG_ERR, "lost %u events", info->overrun_count);
690 690
691 /* Discard lookups on "/dev/log" and "/dev/initctl" */ 691 /* Discard lookups on "/dev/log" and "/dev/initctl" */
692 if (info->type == DEVFSD_NOTIFY_LOOKUP 692 if (info->type == DEVFSD_NOTIFY_LOOKUP
693 && ((info->devname[0] == 'l' && info->devname[1] == 'o' 693 && ((info->devname[0] == 'l' && info->devname[1] == 'o'
694 && info->devname[2] == 'g' && !info->devname[3]) 694 && info->devname[2] == 'g' && !info->devname[3])
695 || (info->devname[0] == 'i' && info->devname[1] == 'n' 695 || (info->devname[0] == 'i' && info->devname[1] == 'n'
696 && info->devname[2] == 'i' && info->devname[3] == 't' 696 && info->devname[2] == 'i' && info->devname[3] == 't'
697 && info->devname[4] == 'c' && info->devname[5] == 't' 697 && info->devname[4] == 'c' && info->devname[5] == 't'
@@ -701,7 +701,7 @@ static void service_name(const struct devfsd_notify_struct *info)
701 701
702 for (entry = first_config; entry != NULL; entry = entry->next) { 702 for (entry = first_config; entry != NULL; entry = entry->next) {
703 /* First check if action matches the type, then check if name matches */ 703 /* First check if action matches the type, then check if name matches */
704 if (info->type != entry->action.when 704 if (info->type != entry->action.when
705 || regexec(&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0) 705 || regexec(&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0)
706 continue; 706 continue;
707 for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n) 707 for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n)
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 5c7d1f60c..98cc04fd3 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1831,7 +1831,7 @@ static void process_dev(char *devname)
1831 } else if (errno == -ENOMSG) 1831 } else if (errno == -ENOMSG)
1832 printf(" no identification info available\n"); 1832 printf(" no identification info available\n");
1833 else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */ 1833 else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */
1834 bb_perror_msg("HDIO_GET_IDENTITY"); 1834 bb_perror_msg("HDIO_GET_IDENTITY");
1835 else 1835 else
1836 bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY); 1836 bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY);
1837 } 1837 }
diff --git a/networking/pscan.c b/networking/pscan.c
index fe146b8bd..9eda16865 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -36,7 +36,7 @@ int pscan_main(int argc, char **argv)
36 const char *opt_max_port = "1024"; /* -P: default max port */ 36 const char *opt_max_port = "1024"; /* -P: default max port */
37 const char *opt_min_port = "1"; /* -p: default min port */ 37 const char *opt_min_port = "1"; /* -p: default min port */
38 const char *opt_timeout = "5000"; /* -t: default timeout in msec */ 38 const char *opt_timeout = "5000"; /* -t: default timeout in msec */
39 /* We estimate rtt and wait rtt*4 before concluding that port is 39 /* We estimate rtt and wait rtt*4 before concluding that port is
40 * totally blocked. min rtt of 5 ms may be too low if you are 40 * totally blocked. min rtt of 5 ms may be too low if you are
41 * scanning an Internet host behind saturated/traffic shaped link. 41 * scanning an Internet host behind saturated/traffic shaped link.
42 * Rule of thumb: with min_rtt of N msec, scanning 1000 ports 42 * Rule of thumb: with min_rtt of N msec, scanning 1000 ports
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index 997daea6c..c0864ed20 100644
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -138,7 +138,7 @@ uint32_t find_address(int check_expired)
138 138
139 /* no lease or it expired and we are checking for expired leases */ 139 /* no lease or it expired and we are checking for expired leases */
140 if ((!lease || (check_expired && lease_expired(lease))) 140 if ((!lease || (check_expired && lease_expired(lease)))
141 && nobody_responds_to_arp(ret) /* it isn't used on the network */ 141 && nobody_responds_to_arp(ret) /* it isn't used on the network */
142 ) { 142 ) {
143 return ret; 143 return ret;
144 } 144 }
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c
index 21a058545..648f7623c 100644
--- a/networking/udhcp/socket.c
+++ b/networking/udhcp/socket.c
@@ -53,7 +53,7 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t
53 ifr.ifr_addr.sa_family = AF_INET; 53 ifr.ifr_addr.sa_family = AF_INET;
54 strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)); 54 strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
55 if (addr) { 55 if (addr) {
56 if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr, 56 if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr,
57 "is interface %s up and configured?", interface) 57 "is interface %s up and configured?", interface)
58 ) { 58 ) {
59 close(fd); 59 close(fd);