diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-10-27 13:36:22 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-10-27 13:36:22 +0000 |
| commit | fcfd86d01c3e94f5dc666e0de373618fcee9cb65 (patch) | |
| tree | 820c0ef338d61d1d1ba54bc7f7aa1062ca5cbff3 | |
| parent | bb1efa070ab2c0137a2b6f2c392c85ff187e02ee (diff) | |
Zap extraneous whitespace and a stuttered extra 'break;'.
| -rw-r--r-- | sbin/dhclient/clparse.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/kroute.c | 6 | ||||
| -rw-r--r-- | sbin/dhclient/options.c | 5 | ||||
| -rw-r--r-- | sbin/dhclient/privsep.c | 6 |
4 files changed, 10 insertions, 11 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index b5f06fb5401..9afae9890bb 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.87 2014/05/12 13:12:41 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.88 2014/10/27 13:36:21 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -129,7 +129,7 @@ read_client_leases(void) warning("Corrupt lease file - possible data loss!"); break; } - parse_client_lease_statement(cfile, 0); + parse_client_lease_statement(cfile, 0); } while (1); fclose(cfile); } diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c index a5b040839af..5c051dea354 100644 --- a/sbin/dhclient/kroute.c +++ b/sbin/dhclient/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.67 2014/07/14 18:16:27 miod Exp $ */ +/* $OpenBSD: kroute.c,v 1.68 2014/10/27 13:36:21 krw Exp $ */ /* * Copyright 2012 Kenneth R Westerback <krw@openbsd.org> @@ -188,7 +188,7 @@ add_route(int rdomain, struct in_addr dest, struct in_addr netmask, if (rslt == -1) warning("add_route: imsg_compose: %s", strerror(errno)); - flush_unpriv_ibuf("add_route"); + flush_unpriv_ibuf("add_route"); } void @@ -302,7 +302,7 @@ delete_addresses(char *ifname, int rdomain) sizeof(addr)); delete_address(ifi->name, ifi->rdomain, addr); - } + } freeifaddrs(ifap); } diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c index 39e76a10726..77789130183 100644 --- a/sbin/dhclient/options.c +++ b/sbin/dhclient/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.70 2014/07/28 16:45:35 tobias Exp $ */ +/* $OpenBSD: options.c,v 1.71 2014/10/27 13:36:21 krw Exp $ */ /* DHCP options parsing and reassembly. */ @@ -256,7 +256,7 @@ pretty_print_classless_routes(unsigned char *dst, size_t dstlen, struct in_addr mask, gateway; int opcount = 0, total = 0, bits, bytes; char ntoabuf[INET_ADDRSTRLEN]; - + while (srclen && dstlen) { bits = *src; src++; @@ -465,7 +465,6 @@ pretty_print_option(unsigned int code, struct option_data *option, *dp ? "true" : "false"); dp++; break; - break; default: warning("Unexpected format code %c", fmtbuf[j]); goto toobig; diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c index f36ea0009ae..97622da9031 100644 --- a/sbin/dhclient/privsep.c +++ b/sbin/dhclient/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.36 2014/02/09 14:21:17 krw Exp $ */ +/* $OpenBSD: privsep.c,v 1.37 2014/10/27 13:36:21 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -85,7 +85,7 @@ dispatch_imsg(struct imsgbuf *ibuf) if (imsg.hdr.len < IMSG_HEADER_SIZE + sizeof(struct imsg_write_file)) warning("short IMSG_WRITE_FILE"); - else { + else { wfimsg = (struct imsg_write_file *)imsg.data; len = imsg.hdr.len; len -= IMSG_HEADER_SIZE; @@ -97,7 +97,7 @@ dispatch_imsg(struct imsgbuf *ibuf) warning("bad IMSG_WRITE_FILE (%zu)", len); } - break; + break; default: warning("received unknown message, code %u", |