remove accumulated stray trailing whitespace

This commit is contained in:
Denis Vlasenko 2007-07-17 21:42:59 +00:00
parent 150d2fa114
commit 49a128a156
8 changed files with 11 additions and 11 deletions

View File

@ -426,7 +426,7 @@ static void edit_file(char * fn)
if (fn != 0) { if (fn != 0) {
ch = file_insert(fn, text); ch = file_insert(fn, text);
update_ro_status(fn); update_ro_status(fn);
} }
if (ch < 1) { if (ch < 1) {
char_insert(text, '\n'); // start empty buf with dummy line char_insert(text, '\n'); // start empty buf with dummy line
} }
@ -2404,7 +2404,7 @@ static int file_size(const char * fn) // what is the byte size of "fn"
return cnt; return cnt;
} }
static int file_insert(char * fn, char * p) static int file_insert(char *fn, char *p)
{ {
int cnt = -1; int cnt = -1;
int fd, size; int fd, size;

View File

@ -3005,7 +3005,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when
"\n -m Do NOT initialize the line in raw 8 bits mode" \ "\n -m Do NOT initialize the line in raw 8 bits mode" \
"\n -L Enable 3-wire operation" \ "\n -L Enable 3-wire operation" \
"\n -F Disable RTS/CTS flow control" \ "\n -F Disable RTS/CTS flow control" \
#define sleep_trivial_usage \ #define sleep_trivial_usage \
USE_FEATURE_FANCY_SLEEP("[") "N" USE_FEATURE_FANCY_SLEEP("]...") USE_FEATURE_FANCY_SLEEP("[") "N" USE_FEATURE_FANCY_SLEEP("]...")
#define sleep_full_usage \ #define sleep_full_usage \

View File

@ -5,7 +5,7 @@
* Copyright 1998 by Albert Cahalan; all rights reserved. * Copyright 1998 by Albert Cahalan; all rights reserved.
* Copyright (C) 2002 by Vladimir Oleynik <dzo@simtreas.ru> * Copyright (C) 2002 by Vladimir Oleynik <dzo@simtreas.ru>
* SELinux support: (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp> * SELinux support: (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp>
* *
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */

View File

@ -689,9 +689,9 @@ static void service_name(const struct devfsd_notify_struct *info)
msg_logger(LOG_ERR, "lost %u events", info->overrun_count); msg_logger(LOG_ERR, "lost %u events", info->overrun_count);
/* Discard lookups on "/dev/log" and "/dev/initctl" */ /* Discard lookups on "/dev/log" and "/dev/initctl" */
if (info->type == DEVFSD_NOTIFY_LOOKUP if (info->type == DEVFSD_NOTIFY_LOOKUP
&& ((info->devname[0] == 'l' && info->devname[1] == 'o' && ((info->devname[0] == 'l' && info->devname[1] == 'o'
&& info->devname[2] == 'g' && !info->devname[3]) && info->devname[2] == 'g' && !info->devname[3])
|| (info->devname[0] == 'i' && info->devname[1] == 'n' || (info->devname[0] == 'i' && info->devname[1] == 'n'
&& info->devname[2] == 'i' && info->devname[3] == 't' && info->devname[2] == 'i' && info->devname[3] == 't'
&& info->devname[4] == 'c' && info->devname[5] == 't' && info->devname[4] == 'c' && info->devname[5] == 't'
@ -701,7 +701,7 @@ static void service_name(const struct devfsd_notify_struct *info)
for (entry = first_config; entry != NULL; entry = entry->next) { for (entry = first_config; entry != NULL; entry = entry->next) {
/* First check if action matches the type, then check if name matches */ /* First check if action matches the type, then check if name matches */
if (info->type != entry->action.when if (info->type != entry->action.when
|| regexec(&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0) || regexec(&entry->preg, info->devname, MAX_SUBEXPR, mbuf, 0) != 0)
continue; continue;
for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n) for (n = 0;(n < MAX_SUBEXPR) && (mbuf[n].rm_so != -1); ++n)

View File

@ -1831,7 +1831,7 @@ static void process_dev(char *devname)
} else if (errno == -ENOMSG) } else if (errno == -ENOMSG)
printf(" no identification info available\n"); printf(" no identification info available\n");
else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */ else if (ENABLE_IOCTL_HEX2STR_ERROR) /* To be coherent with ioctl_or_warn */
bb_perror_msg("HDIO_GET_IDENTITY"); bb_perror_msg("HDIO_GET_IDENTITY");
else else
bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY); bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY);
} }

View File

@ -36,7 +36,7 @@ int pscan_main(int argc, char **argv)
const char *opt_max_port = "1024"; /* -P: default max port */ const char *opt_max_port = "1024"; /* -P: default max port */
const char *opt_min_port = "1"; /* -p: default min port */ const char *opt_min_port = "1"; /* -p: default min port */
const char *opt_timeout = "5000"; /* -t: default timeout in msec */ const char *opt_timeout = "5000"; /* -t: default timeout in msec */
/* We estimate rtt and wait rtt*4 before concluding that port is /* We estimate rtt and wait rtt*4 before concluding that port is
* totally blocked. min rtt of 5 ms may be too low if you are * totally blocked. min rtt of 5 ms may be too low if you are
* scanning an Internet host behind saturated/traffic shaped link. * scanning an Internet host behind saturated/traffic shaped link.
* Rule of thumb: with min_rtt of N msec, scanning 1000 ports * Rule of thumb: with min_rtt of N msec, scanning 1000 ports

View File

@ -138,7 +138,7 @@ uint32_t find_address(int check_expired)
/* no lease or it expired and we are checking for expired leases */ /* no lease or it expired and we are checking for expired leases */
if ((!lease || (check_expired && lease_expired(lease))) if ((!lease || (check_expired && lease_expired(lease)))
&& nobody_responds_to_arp(ret) /* it isn't used on the network */ && nobody_responds_to_arp(ret) /* it isn't used on the network */
) { ) {
return ret; return ret;
} }

View File

@ -53,7 +53,7 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t
ifr.ifr_addr.sa_family = AF_INET; ifr.ifr_addr.sa_family = AF_INET;
strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)); strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name));
if (addr) { if (addr) {
if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr, if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr,
"is interface %s up and configured?", interface) "is interface %s up and configured?", interface)
) { ) {
close(fd); close(fd);