diff options
| -rw-r--r-- | editors/vi.c | 4 | ||||
| -rw-r--r-- | include/usage.h | 2 | ||||
| -rw-r--r-- | libbb/procps.c | 2 | ||||
| -rw-r--r-- | miscutils/devfsd.c | 6 | ||||
| -rw-r--r-- | miscutils/hdparm.c | 2 | ||||
| -rw-r--r-- | networking/pscan.c | 2 | ||||
| -rw-r--r-- | networking/udhcp/leases.c | 2 | ||||
| -rw-r--r-- | networking/udhcp/socket.c | 2 |
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) if (fn != 0) { ch = file_insert(fn, text); update_ro_status(fn); - } + } if (ch < 1) { 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; } -static int file_insert(char * fn, char * p) +static int file_insert(char *fn, char *p) { int cnt = -1; 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 "\n -m Do NOT initialize the line in raw 8 bits mode" \ "\n -L Enable 3-wire operation" \ "\n -F Disable RTS/CTS flow control" \ - + #define sleep_trivial_usage \ USE_FEATURE_FANCY_SLEEP("[") "N" USE_FEATURE_FANCY_SLEEP("]...") #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 @@ * Copyright 1998 by Albert Cahalan; all rights reserved. * Copyright (C) 2002 by Vladimir Oleynik <dzo@simtreas.ru> * SELinux support: (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp> - * + * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ 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) msg_logger(LOG_ERR, "lost %u events", info->overrun_count); /* 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[2] == 'g' && !info->devname[3]) + && info->devname[2] == 'g' && !info->devname[3]) || (info->devname[0] == 'i' && info->devname[1] == 'n' && info->devname[2] == 'i' && info->devname[3] == '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) { /* 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) continue; 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) } else if (errno == -ENOMSG) printf(" no identification info available\n"); 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 bb_perror_msg("ioctl %#x failed", HDIO_GET_IDENTITY); } 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) const char *opt_max_port = "1024"; /* -P: default max port */ const char *opt_min_port = "1"; /* -p: default min port */ 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 * scanning an Internet host behind saturated/traffic shaped link. * 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) /* no lease or it expired and we are checking for expired leases */ 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; } 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 ifr.ifr_addr.sa_family = AF_INET; strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)); if (addr) { - if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr, + if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr, "is interface %s up and configured?", interface) ) { close(fd); |