From: Roy Marples Date: Thu, 4 Apr 2013 20:31:04 +0000 (+0000) Subject: White space police X-Git-Tag: v5.99.6~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cc47ba26db5b197c4641d86b54bde6abeface2f;p=thirdparty%2Fdhcpcd.git White space police --- diff --git a/arp.c b/arp.c index f014b1b9..13a2cc2f 100644 --- a/arp.c +++ b/arp.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/arp.h b/arp.h index 3274bbb3..65ac2588 100644 --- a/arp.h +++ b/arp.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/common.c b/common.c index 1725e560..ab3a0580 100644 --- a/common.c +++ b/common.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2012 Roy Marples * All rights reserved diff --git a/common.h b/common.h index e6976165..7d5260d0 100644 --- a/common.h +++ b/common.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved @@ -46,7 +46,7 @@ ms = (tv)->tv_sec * 1000; \ ms += (tv)->tv_usec / 1000; \ } while (0 /* CONSTCOND */); -#define ms_to_tv(tv, ms) do { \ +#define ms_to_tv(tv, ms) do { \ (tv)->tv_sec = ms / 1000; \ (tv)->tv_usec = (ms - ((tv)->tv_sec * 1000)) * 1000; \ } while (0 /* CONSTCOND */); diff --git a/control.c b/control.c index 2bfcb77f..9884ab31 100644 --- a/control.c +++ b/control.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2012 Roy Marples * All rights reserved diff --git a/control.h b/control.h index 08e858b1..02627eb6 100644 --- a/control.h +++ b/control.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2012 Roy Marples * All rights reserved diff --git a/dhcp-common.c b/dhcp-common.c index d37477ea..6c9ab780 100644 --- a/dhcp-common.c +++ b/dhcp-common.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved @@ -198,7 +198,7 @@ print_string(char *s, ssize_t len, int dl, const uint8_t *data) case '\'': /* FALLTHROUGH */ case '$': /* FALLTHROUGH */ case '`': /* FALLTHROUGH */ - case '\\': /* FALLTHROUGH */ + case '\\': /* FALLTHROUGH */ case '|': /* FALLTHROUGH */ case '&': if (s) { diff --git a/dhcp-common.h b/dhcp-common.h index 48dcc145..794953f7 100644 --- a/dhcp-common.h +++ b/dhcp-common.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2012 Roy Marples * All rights reserved diff --git a/dhcp.c b/dhcp.c index 3fbe4dd0..12efea99 100644 --- a/dhcp.c +++ b/dhcp.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved @@ -77,7 +77,7 @@ static uint8_t *opt_buffer; #define IPV4A ADDRIPV4 | ARRAY #define IPV4R ADDRIPV4 | REQUEST -/* We should define a maximum for the NAK exponential backoff */ +/* We should define a maximum for the NAK exponential backoff */ #define NAKOFF_MAX 60 /* Wait N nanoseconds between sending a RELEASE and dropping the address. @@ -106,7 +106,7 @@ const struct dhcp_opt const dhcp_opts[] = { { 1, ADDRIPV4 | REQUEST, "subnet_mask" }, /* RFC 3442 states that the CSR has to come before all other * routes. For completeness, we also specify static routes, - * then routers. */ + * then routers. */ { 121, RFC3442, "classless_static_routes" }, { 249, RFC3442, "ms_classless_static_routes" }, { 33, IPV4A | REQUEST, "static_routes" }, @@ -117,7 +117,7 @@ const struct dhcp_opt const dhcp_opts[] = { { 6, IPV4A, "domain_name_servers" }, { 7, IPV4A, "log_servers" }, { 8, IPV4A, "cookie_servers" }, - { 9, IPV4A, "lpr_servers" }, + { 9, IPV4A, "lpr_servers" }, { 10, IPV4A, "impress_servers" }, { 11, IPV4A, "resource_location_servers" }, { 12, STRING, "host_name" }, @@ -142,7 +142,7 @@ const struct dhcp_opt const dhcp_opts[] = { { 31, UINT8, "router_discovery" }, { 32, ADDRIPV4, "router_solicitation_address" }, { 34, UINT8, "trailer_encapsulation" }, - { 35, UINT32, "arp_cache_timeout" }, + { 35, UINT32, "arp_cache_timeout" }, { 36, UINT16, "ieee802_3_encapsulation" }, { 37, UINT8, "default_tcp_ttl" }, { 38, UINT32, "tcp_keepalive_interval" }, @@ -157,7 +157,7 @@ const struct dhcp_opt const dhcp_opts[] = { { 47, STRING, "netbios_scope" }, { 48, IPV4A, "font_servers" }, { 49, IPV4A, "x_display_manager" }, - { 50, ADDRIPV4, "dhcp_requested_address" }, + { 50, ADDRIPV4, "dhcp_requested_address" }, { 51, UINT32 | REQUEST, "dhcp_lease_time" }, { 52, UINT8, "dhcp_option_overload" }, { 53, UINT8, "dhcp_message_type" }, @@ -311,7 +311,7 @@ get_option(const struct dhcp_message *dhcp, uint8_t opt, int *len, int *type) atexit(free_option_buffer); #endif } - if (!bp) + if (!bp) bp = opt_buffer; memcpy(bp, op, ol); bp += ol; @@ -591,12 +591,12 @@ decode_rfc5969(char *out, ssize_t len, int pl, const uint8_t *p) errno = EINVAL; return 0; } - + ipv4masklen = *p++; pl--; ipv6prefixlen = *p++; pl--; - + for (i = 0; i < 16; i++) { ipv6prefix[i] = *p++; pl--; @@ -614,7 +614,7 @@ decode_rfc5969(char *out, ssize_t len, int pl, const uint8_t *p) ipv6prefix[8], ipv6prefix[9], ipv6prefix[10],ipv6prefix[11], ipv6prefix[12],ipv6prefix[13],ipv6prefix[14], ipv6prefix[15] ); - + len -= b; out += b; bytes += b; @@ -628,7 +628,7 @@ decode_rfc5969(char *out, ssize_t len, int pl, const uint8_t *p) br[2] = *p++; br[3] = *p++; pl -= 4; - + if (out) { b= snprintf(out, len, " %d.%d.%d.%d", br[0], br[1], br[2], br[3]); @@ -639,7 +639,7 @@ decode_rfc5969(char *out, ssize_t len, int pl, const uint8_t *p) bytes += (4 * 4); } } - + return bytes; } @@ -913,7 +913,7 @@ make_message(struct dhcp_message **message, dhcp->xid = htonl(state->xid); dhcp->cookie = htonl(MAGIC_COOKIE); - *p++ = DHO_MESSAGETYPE; + *p++ = DHO_MESSAGETYPE; *p++ = 1; *p++ = type; @@ -1043,7 +1043,7 @@ make_message(struct dhcp_message **message, n_params = p; *p++ = 0; for (opt = dhcp_opts; opt->option; opt++) { - if (!(opt->type & REQUEST || + if (!(opt->type & REQUEST || has_option_mask(ifo->requestmask, opt->option))) continue; if (type == DHCP_INFORM && @@ -1290,7 +1290,7 @@ dhcp_xid(const struct interface *ifp) uint32_t xid; if (ifp->options->options & DHCPCD_XID_HWADDR && - ifp->hwlen >= sizeof(xid)) + ifp->hwlen >= sizeof(xid)) /* The lower bits are probably more unique on the network */ memcpy(&xid, (ifp->hwaddr + ifp->hwlen) - sizeof(xid), sizeof(xid)); @@ -1357,7 +1357,7 @@ dhcp_openudp(struct interface *iface) goto eexit; #endif /* As we don't use this socket for receiving, set the - * * receive buffer to 1 */ + * receive buffer to 1 */ n = 1; if (setsockopt(s, SOL_SOCKET, SO_RCVBUF, &n, sizeof(n)) == -1) goto eexit; @@ -1879,7 +1879,7 @@ handle_3rdparty(struct interface *ifp) struct if_options *ifo; struct dhcp_state *state; struct in_addr addr, net, dst; - + ifo = ifp->options; if (ifo->req_addr.s_addr != INADDR_ANY) return 0; @@ -2072,7 +2072,7 @@ static int blacklisted_ip(const struct if_options *ifo, in_addr_t addr) { size_t i; - + for (i = 0; i < ifo->blacklist_len; i += 2) if (ifo->blacklist[i] == (addr & ifo->blacklist[i + 1])) return 1; @@ -2108,7 +2108,7 @@ dhcp_handle(struct interface *iface, struct dhcp_message **dhcpp, state->interval = 0; /* We may have found a BOOTP server */ - if (get_option_uint8(&type, dhcp, DHO_MESSAGETYPE) == -1) + if (get_option_uint8(&type, dhcp, DHO_MESSAGETYPE) == -1) type = 0; if (type == DHCP_NAK) { @@ -2527,7 +2527,7 @@ dhcp_init(struct interface *ifp) ifo = ifp->options; /* We need to drop the leasefile so that start_interface - * doesn't load it. */ + * doesn't load it. */ if (ifo->options & DHCPCD_REQUEST) unlink(state->leasefile); @@ -2681,4 +2681,3 @@ dhcp_start(struct interface *ifp) else dhcp_reboot(ifp); } - diff --git a/dhcp.h b/dhcp.h index ed578503..d6637a0b 100644 --- a/dhcp.h +++ b/dhcp.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/dhcpcd.c b/dhcpcd.c index 759b2314..8401cf10 100644 --- a/dhcpcd.c +++ b/dhcpcd.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/dhcpcd.h b/dhcpcd.h index 09c19254..ac8b42f8 100644 --- a/dhcpcd.h +++ b/dhcpcd.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved @@ -42,9 +42,9 @@ #define IF_SSIDSIZE 33 #define PROFILE_LEN 64 -#define LINK_UP 1 +#define LINK_UP 1 #define LINK_UNKNOWN 0 -#define LINK_DOWN -1 +#define LINK_DOWN -1 #define IF_DATA_DHCP 0 #define IF_DATA_IPV6RS 1 diff --git a/duid.c b/duid.c index e04719d7..b94b3927 100644 --- a/duid.c +++ b/duid.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2008 Roy Marples * All rights reserved diff --git a/duid.h b/duid.h index 98c1bbd5..4693102b 100644 --- a/duid.h +++ b/duid.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2008 Roy Marples * All rights reserved diff --git a/eloop.c b/eloop.c index 3dfb50c2..c1a78f47 100644 --- a/eloop.c +++ b/eloop.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/eloop.h b/eloop.h index 8a18d9c5..235ec110 100644 --- a/eloop.h +++ b/eloop.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/if-bsd.c b/if-bsd.c index 9fb7130c..74fc0aea 100644 --- a/if-bsd.c +++ b/if-bsd.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/if-linux-wireless.c b/if-linux-wireless.c index b8f68faa..2d9519e2 100644 --- a/if-linux-wireless.c +++ b/if-linux-wireless.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2009-2013 Roy Marples * All rights reserved diff --git a/if-linux.c b/if-linux.c index 9cdc8392..8da8d4dc 100644 --- a/if-linux.c +++ b/if-linux.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/if-options.c b/if-options.c index b733fd37..33d85af4 100644 --- a/if-options.c +++ b/if-options.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/if-options.h b/if-options.h index ea14a5d3..9a4a835b 100644 --- a/if-options.h +++ b/if-options.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/if-pref.c b/if-pref.c index 3d024a60..60a5b12f 100644 --- a/if-pref.c +++ b/if-pref.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/if-pref.h b/if-pref.h index dcedd602..bea453b2 100644 --- a/if-pref.h +++ b/if-pref.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2008 Roy Marples * All rights reserved diff --git a/ipv4.c b/ipv4.c index 3eff99f6..d57c9321 100644 --- a/ipv4.c +++ b/ipv4.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/ipv4.h b/ipv4.h index bc1c691a..ae9d6fcf 100644 --- a/ipv4.h +++ b/ipv4.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/ipv4ll.c b/ipv4ll.c index d2e069fc..27adc3a3 100644 --- a/ipv4ll.c +++ b/ipv4ll.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/ipv4ll.h b/ipv4ll.h index 7bdc89a2..462b6312 100644 --- a/ipv4ll.h +++ b/ipv4ll.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2012 Roy Marples * All rights reserved diff --git a/ipv6.c b/ipv6.c index f1317b18..042c2a52 100644 --- a/ipv6.c +++ b/ipv6.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/ipv6.h b/ipv6.h index bbc0e191..67e8a366 100644 --- a/ipv6.h +++ b/ipv6.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/ipv6ns.c b/ipv6ns.c index 4fdefd1d..b4c85a45 100644 --- a/ipv6ns.c +++ b/ipv6ns.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/ipv6ns.h b/ipv6ns.h index 2a63d3b0..e14856b2 100644 --- a/ipv6ns.h +++ b/ipv6ns.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved @@ -32,8 +32,8 @@ #include "ipv6rs.h" #define MAX_REACHABLE_TIME 3600 /* seconds */ -#define REACHABLE_TIME 30 /* seconds */ -#define RETRANS_TIMER 1 /* second */ +#define REACHABLE_TIME 30 /* seconds */ +#define RETRANS_TIMER 1 /* second */ #define DELAY_FIRST_PROBE_TIME 5 /* seconds */ int ipv6ns_init(void); diff --git a/ipv6rs.c b/ipv6rs.c index e26a67d1..adbb1149 100644 --- a/ipv6rs.c +++ b/ipv6rs.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/ipv6rs.h b/ipv6rs.h index b78abf66..5cdb9410 100644 --- a/ipv6rs.h +++ b/ipv6rs.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/net.c b/net.c index 5245554a..b96f09fd 100644 --- a/net.c +++ b/net.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/net.h b/net.h index 9f832fbf..9c096248 100644 --- a/net.h +++ b/net.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/platform-bsd.c b/platform-bsd.c index 76d83fe8..93048fc1 100644 --- a/platform-bsd.c +++ b/platform-bsd.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2012 Roy Marples * All rights reserved diff --git a/platform.h b/platform.h index 08ec368a..2c738797 100644 --- a/platform.h +++ b/platform.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2012 Roy Marples * All rights reserved diff --git a/script.c b/script.c index b36c80e6..43a39f4e 100644 --- a/script.c +++ b/script.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/script.h b/script.h index 5979355c..4f9a085a 100644 --- a/script.h +++ b/script.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/signals.c b/signals.c index 58263c85..1dc4de96 100644 --- a/signals.c +++ b/signals.c @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved diff --git a/signals.h b/signals.h index bb5a0d77..eb5e5fff 100644 --- a/signals.h +++ b/signals.h @@ -1,4 +1,4 @@ -/* +/* * dhcpcd - DHCP client daemon * Copyright (c) 2006-2013 Roy Marples * All rights reserved