# HG changeset patch # User Sascha Wildner # Date 1600977236 -3600 # Node ID e01d8ea25a424a1fc55ddeede2fad568309f61bb # Parent f137886e62117c6c01e97225f4c347bcd9cfbf54 Clean up some warnings. diff -r f137886e6211 -r e01d8ea25a42 src/bpf.c --- a/src/bpf.c Thu Sep 24 03:49:30 2020 +0100 +++ b/src/bpf.c Thu Sep 24 20:53:56 2020 +0100 @@ -70,14 +70,14 @@ (insn)->jt = 0; \ (insn)->jf = 0; \ (insn)->k = (uint32_t)(v); \ -}; +} #define BPF_SET_JUMP(insn, c, v, t, f) { \ (insn)->code = (c); \ (insn)->jt = (t); \ (insn)->jf = (f); \ (insn)->k = (uint32_t)(v); \ -}; +} size_t bpf_frame_header_len(const struct interface *ifp) @@ -585,9 +585,6 @@ }; #define BPF_BOOTP_ETHER_LEN __arraycount(bpf_bootp_ether) -#define BOOTP_MIN_SIZE sizeof(struct ip) + sizeof(struct udphdr) + \ - sizeof(struct bootp) - static const struct bpf_insn bpf_bootp_base[] = { /* Make sure it's an IPv4 packet. */ BPF_STMT(BPF_LD + BPF_B + BPF_IND, 0), diff -r f137886e6211 -r e01d8ea25a42 src/dhcp6.c --- a/src/dhcp6.c Thu Sep 24 03:49:30 2020 +0100 +++ b/src/dhcp6.c Thu Sep 24 20:53:56 2020 +0100 @@ -147,7 +147,7 @@ uint16_t dhcp6_opt; }; -const struct dhcp_compat dhcp_compats[] = { +static const struct dhcp_compat dhcp_compats[] = { { DHO_DNSSERVER, D6_OPTION_DNS_SERVERS }, { DHO_HOSTNAME, D6_OPTION_FQDN }, { DHO_DNSDOMAIN, D6_OPTION_FQDN }, diff -r f137886e6211 -r e01d8ea25a42 src/dhcpcd.c --- a/src/dhcpcd.c Thu Sep 24 03:49:30 2020 +0100 +++ b/src/dhcpcd.c Thu Sep 24 20:53:56 2020 +0100 @@ -26,7 +26,7 @@ * SUCH DAMAGE. */ -const char dhcpcd_copyright[] = "Copyright (c) 2006-2020 Roy Marples"; +static const char dhcpcd_copyright[] = "Copyright (c) 2006-2020 Roy Marples"; #include #include diff -r f137886e6211 -r e01d8ea25a42 src/ipv6nd.c --- a/src/ipv6nd.c Thu Sep 24 03:49:30 2020 +0100 +++ b/src/ipv6nd.c Thu Sep 24 20:53:56 2020 +0100 @@ -1223,7 +1223,7 @@ if (rap->willexpire) new_data = true; loglevel = new_rap || rap->willexpire || !rap->isreachable ? - LOG_INFO : LOG_DEBUG, + LOG_INFO : LOG_DEBUG; logmessage(loglevel, "%s: Router Advertisement from %s", ifp->name, rap->sfrom);