diff options
| author |   krw <krw@openbsd.org> | 2019-01-18 01:38:58 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2019-01-18 01:38:58 +0000 |
| commit | 16e0481f48c4e8c6ce1c49ae18477f1233fe2039 (patch) | |
| tree | 501064d4fba732f9a10ae129ce407c489206fef3 | |
| parent | delete vmm(4) in i386 (diff) | |
| download | wireguard-openbsd-16e0481f48c4e8c6ce1c49ae18477f1233fe2039.tar.xz wireguard-openbsd-16e0481f48c4e8c6ce1c49ae18477f1233fe2039.zip | |
Be consistent in explicitly testing memcmp() return values.
| -rw-r--r-- | sbin/dhclient/clparse.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhclient.c | 9 | ||||
| -rw-r--r-- | sbin/dhclient/dispatch.c | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index 578e4f5511f..fcdb6fde1d1 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.176 2019/01/14 04:54:46 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.177 2019/01/18 01:38:58 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -213,7 +213,7 @@ read_lease_db(char *name, struct client_lease_tq *tq) lease->options[DHO_DHCP_CLIENT_IDENTIFIER].len) || memcmp(lp->options[DHO_DHCP_CLIENT_IDENTIFIER].data, lease->options[DHO_DHCP_CLIENT_IDENTIFIER].data, - lp->options[DHO_DHCP_CLIENT_IDENTIFIER].len))) + lp->options[DHO_DHCP_CLIENT_IDENTIFIER].len) != 0)) continue; if (lp->address.s_addr != lease->address.s_addr) continue; diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index e691adb5698..7b9ca99da52 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.610 2019/01/17 23:36:20 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.611 2019/01/18 01:38:58 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -395,7 +395,7 @@ rtm_dispatch(struct interface_info *ifi, struct rt_msghdr *rtm) if (newlinkup != 0) { memcpy(&hw, &ifi->hw_address, sizeof(hw)); get_hw_address(ifi); - if (memcmp(&hw, &ifi->hw_address, sizeof(hw))) { + if (memcmp(&hw, &ifi->hw_address, sizeof(hw)) != 0) { tick_msg("", 0, INT64_MAX); log_warnx("%s: LLADDR changed", log_procname); quit = SIGHUP; @@ -1019,8 +1019,7 @@ newlease: continue; if (ifi->ssid_len != ll->ssid_len) continue; - if (memcmp(ifi->ssid, ll->ssid, ll->ssid_len) - != 0) + if (memcmp(ifi->ssid, ll->ssid, ll->ssid_len) != 0) continue; if (ifi->active == ll) seen = 1; @@ -2559,7 +2558,7 @@ get_recorded_lease(struct interface_info *ifi) if ((lp->options[i].len != 0) && ((lp->options[i].len != config->send_options[i].len) || memcmp(lp->options[i].data, config->send_options[i].data, - lp->options[i].len))) + lp->options[i].len) != 0)) continue; if (addressinuse(ifi->name, lp->address, ifname) != 0 && strncmp(ifname, ifi->name, IF_NAMESIZE) != 0) diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c index 03e9619c59f..4248aa85130 100644 --- a/sbin/dhclient/dispatch.c +++ b/sbin/dhclient/dispatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.158 2019/01/05 21:40:44 krw Exp $ */ +/* $OpenBSD: dispatch.c,v 1.159 2019/01/18 01:38:58 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -227,7 +227,7 @@ dhcp_packet_dispatch(struct interface_info *ifi, struct sockaddr_in *from, packet->hlen); return; } else if (memcmp(&ifi->hw_address, packet->chaddr, - sizeof(ifi->hw_address))) { + sizeof(ifi->hw_address)) != 0) { log_debug("%s: discarding packet with chaddr == %s", log_procname, ether_ntoa((struct ether_addr *)packet->chaddr)); |