From d2ee4e550ae0a880aadd789056f04427620e2f36 Mon Sep 17 00:00:00 2001 From: krw Date: Mon, 5 May 2014 18:02:49 +0000 Subject: [PATCH] Zap trailing whitespace. Started by pointed comments from andre@. --- sbin/dhclient/clparse.c | 4 ++-- sbin/dhclient/conflex.c | 4 ++-- sbin/dhclient/dhclient.c | 8 ++++---- sbin/dhclient/dispatch.c | 6 +++--- sbin/dhclient/kroute.c | 8 ++++---- sbin/dhclient/options.c | 6 +++--- sbin/dhclient/parse.c | 12 ++++++------ 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index 1632bd17ff7..69b30bc801a 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.84 2014/05/05 14:44:18 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.85 2014/05/05 18:02:49 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -165,7 +165,7 @@ parse_client_statement(FILE *cfile) int code, count, token; token = next_token(NULL, cfile); - + switch (token) { case TOK_SEND: parse_option_decl(cfile, &config->send_options[0]); diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c index 588873e2178..46fb37e31d9 100644 --- a/sbin/dhclient/conflex.c +++ b/sbin/dhclient/conflex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conflex.c,v 1.28 2014/01/19 03:54:25 krw Exp $ */ +/* $OpenBSD: conflex.c,v 1.29 2014/05/05 18:02:49 krw Exp $ */ /* Lexical scanner for dhclient config file. */ @@ -133,7 +133,7 @@ get_token(FILE *cfile) int l, p, u; u = ugflag; - + do { l = line; p = lpos - u; diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 8c4e3743094..993a6914201 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.302 2014/05/05 14:44:18 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.303 2014/05/05 18:02:49 krw Exp $ */ /* * Copyright 2004 Henning Brauer @@ -790,7 +790,7 @@ bind_lease(void) options = lease->options; set_lease_times(lease); - + client->new->expiry = lease->expiry; client->new->renewal = lease->renewal; client->new->rebind = lease->rebind; @@ -2109,7 +2109,7 @@ apply_defaults(struct client_lease *lease) } if (j < config->ignored_option_count) continue; - + switch (config->default_actions[i]) { case ACTION_SUPERSEDE: if (newlease->options[i].len != 0) @@ -2272,7 +2272,7 @@ apply_ignore_list(char *ignore_list) p = strsep(&ignore_list, ", ")) { if (*p == '\0') continue; - + for (i = 1; i < DHO_END; i++) if (!strcasecmp(dhcp_options[i].name, p)) break; diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c index 57e6f62bf40..f0380cf54d0 100644 --- a/sbin/dhclient/dispatch.c +++ b/sbin/dhclient/dispatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.89 2014/02/18 01:46:58 krw Exp $ */ +/* $OpenBSD: dispatch.c,v 1.90 2014/05/05 18:02:49 krw Exp $ */ /* * Copyright 2004 Henning Brauer @@ -86,7 +86,7 @@ discover_interface(void) if (foo->sdl_alen != ETHER_ADDR_LEN) continue; - + ifi->index = foo->sdl_index; memcpy(ifi->hw_address.ether_addr_octet, LLADDR(foo), ETHER_ADDR_LEN); @@ -446,7 +446,7 @@ subnet_exists(struct client_lease *l) ifa->ifa_name); return (1); } - + /* Would my packets go out *his* interface? */ if (hisnet.s_addr == (myaddr.s_addr & hismask.s_addr)) { note("interface %s already has the offered subnet!", diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c index d0e5adca96a..9e9006c9c04 100644 --- a/sbin/dhclient/kroute.c +++ b/sbin/dhclient/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.64 2014/02/13 00:24:13 krw Exp $ */ +/* $OpenBSD: kroute.c,v 1.65 2014/05/05 18:02:49 krw Exp $ */ /* * Copyright 2012 Kenneth R Westerback @@ -217,7 +217,7 @@ priv_add_route(struct imsg_add_route *imsg) iov[iovcnt].iov_base = &rtm; iov[iovcnt++].iov_len = sizeof(rtm); - + if (imsg->addrs & RTA_DST) { memset(&dest, 0, sizeof(dest)); @@ -230,7 +230,7 @@ priv_add_route(struct imsg_add_route *imsg) iov[iovcnt].iov_base = &dest; iov[iovcnt++].iov_len = sizeof(dest); } - + if (imsg->addrs & RTA_GATEWAY) { memset(&gateway, 0, sizeof(gateway)); @@ -533,7 +533,7 @@ resolv_conf_priority(int domain) iov[iovcnt].iov_base = &m_rtmsg.m_rtm; iov[iovcnt++].iov_len = sizeof(m_rtmsg.m_rtm); - + /* Set destination & netmask addresses of all zeros. */ m_rtmsg.m_rtm.rtm_addrs = RTA_DST | RTA_NETMASK; diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c index 754254c58fe..5517a290681 100644 --- a/sbin/dhclient/options.c +++ b/sbin/dhclient/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.67 2014/01/21 03:07:50 krw Exp $ */ +/* $OpenBSD: options.c,v 1.68 2014/05/05 18:02:49 krw Exp $ */ /* DHCP options parsing and reassembly. */ @@ -414,9 +414,9 @@ pretty_print_option(unsigned int code, struct option_data *option, break; case 'C': memset(&foo, 0, sizeof(foo)); - memcpy(&foo.s_addr, dp+1, (*dp + 7) / 8); + memcpy(&foo.s_addr, dp+1, (*dp + 7) / 8); opcount = snprintf(op, opleft, "%s/%u", - inet_ntoa(foo), *dp); + inet_ntoa(foo), *dp); if (opcount >= opleft || opcount == -1) goto toobig; dp += 1 + (*dp + 7) / 8; diff --git a/sbin/dhclient/parse.c b/sbin/dhclient/parse.c index d900d67b3a0..bd71cccbd1b 100644 --- a/sbin/dhclient/parse.c +++ b/sbin/dhclient/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.37 2014/01/21 03:07:50 krw Exp $ */ +/* $OpenBSD: parse.c,v 1.38 2014/05/05 18:02:49 krw Exp $ */ /* Common parser code for dhcpd and dhclient. */ @@ -141,7 +141,7 @@ parse_string(FILE *cfile) * bit-count :== 0..32 */ int -parse_cidr(FILE *cfile, unsigned char *cidr) +parse_cidr(FILE *cfile, unsigned char *cidr) { struct in_addr addr; int token; @@ -254,7 +254,7 @@ parse_lease_time(FILE *cfile, time_t *timep) skip_to_semi(cfile); return; } - + *timep = betoh32(value); parse_semi(cfile); @@ -269,7 +269,7 @@ parse_decimal(FILE *cfile, unsigned char *buf, char fmt) long long numval, low, high; token = next_token(&val, cfile); - + switch (fmt) { case 'l': /* Signed 32-bit integer. */ low = INT32_MIN; @@ -311,7 +311,7 @@ parse_hex(FILE *cfile, unsigned char *buf) char *val, *ep; int token; unsigned long ulval; - + token = next_token(&val, cfile); errno = 0; @@ -322,7 +322,7 @@ parse_hex(FILE *cfile, unsigned char *buf) return (0); buf[0] = ulval; - + return (1); } -- 2.20.1