From: florian <florian@openbsd.org>
Date: Sat, 8 Jul 2017 16:21:51 +0000 (+0000)
Subject: Consistently use if (option & F_FOO); from Klemens Nanni, thanks!
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=466a9f04d1a7d749627200200012ef40165dd10e;p=openbsd

Consistently use if (option & F_FOO); from Klemens Nanni, thanks!
---

diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 266816355cf..a837a77237f 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping.c,v 1.221 2017/07/05 07:15:40 florian Exp $	*/
+/*	$OpenBSD: ping.c,v 1.222 2017/07/08 16:21:51 florian Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -621,7 +621,7 @@ main(int argc, char *argv[])
 		 * let the kernel pass extension headers of incoming packets,
 		 * for privileged socket options
 		 */
-		if ((options & F_VERBOSE) != 0) {
+		if (options & F_VERBOSE) {
 			int opton = 1;
 
 			if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPOPTS,
@@ -771,7 +771,7 @@ main(int argc, char *argv[])
 	(void)signal(SIGINT, onsignal);
 	(void)signal(SIGINFO, onsignal);
 
-	if ((options & F_FLOOD) == 0) {
+	if (!(options & F_FLOOD)) {
 		(void)signal(SIGALRM, onsignal);
 		itimer.it_interval = interval;
 		itimer.it_value = interval;
@@ -859,7 +859,7 @@ main(int argc, char *argv[])
 			 * a path MTU notification.)
 			 */
 			if ((mtu = get_pathmtu(&m, &dst6)) > 0) {
-				if ((options & F_VERBOSE) != 0) {
+				if (options & F_VERBOSE) {
 					printf("new path MTU (%d) is "
 					    "notified\n", mtu);
 				}
@@ -959,7 +959,7 @@ pr_addr(struct sockaddr *addr, socklen_t addrlen)
 	static char buf[NI_MAXHOST];
 	int flag = 0;
 
-	if ((options & F_HOSTNAME) == 0)
+	if (!(options & F_HOSTNAME))
 		flag |= NI_NUMERICHOST;
 
 	if (getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0, flag) == 0)
@@ -1890,7 +1890,7 @@ get_pathmtu(struct msghdr *mhdr, struct sockaddr_in6 *dst)
 			    dst->sin6_scope_id &&
 			    mtuctl->ip6m_addr.sin6_scope_id !=
 			    dst->sin6_scope_id)) {
-				if ((options & F_VERBOSE) != 0) {
+				if (options & F_VERBOSE) {
 					printf("path MTU for %s is notified. "
 					    "(ignored)\n",
 					    pr_addr((struct sockaddr *)