git: 8f88432a1de0 - stable/12 - ofed: quiet gcc -Wint-in-bool-context
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Mar 2023 22:28:46 UTC
The branch stable/12 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=8f88432a1de012706ca04113b05600724fb71a5f
commit 8f88432a1de012706ca04113b05600724fb71a5f
Author: Ryan Libby <rlibby@FreeBSD.org>
AuthorDate: 2021-02-24 23:56:16 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-03-22 22:27:09 +0000
ofed: quiet gcc -Wint-in-bool-context
The int in the argument to the ternary triggered -Wint-in-bool-context
from gcc. Upstream linux has a larger and more entangled patch,
12f727721eee61b3d19dedb95cb893b2baa9fe41, which doesn't apply cleanly.
When we eventually sync that, we can just drop this change.
Reviewed by: hselasky, imp, kib
MFC after: 3 days
Sponsored by: Dell EMC Isilon
Differential Revision: https://reviews.freebsd.org/D28762
(cherry picked from commit bf667f282a7b98e7456d11e1cb46d9707ab8e774)
---
sys/ofed/drivers/infiniband/core/uverbs.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys/ofed/drivers/infiniband/core/uverbs.h b/sys/ofed/drivers/infiniband/core/uverbs.h
index 6c8d9632b0dc..0db0d47cc691 100644
--- a/sys/ofed/drivers/infiniband/core/uverbs.h
+++ b/sys/ofed/drivers/infiniband/core/uverbs.h
@@ -64,8 +64,10 @@
#define INIT_UDATA_BUF_OR_NULL(udata, ibuf, obuf, ilen, olen) \
do { \
- (udata)->inbuf = (ilen) ? (const void __user *) (ibuf) : NULL; \
- (udata)->outbuf = (olen) ? (void __user *) (obuf) : NULL; \
+ (udata)->inbuf = ((ilen) != 0) ? \
+ (const void __user *) (ibuf) : NULL; \
+ (udata)->outbuf = ((olen) != 0) ? \
+ (void __user *) (obuf) : NULL; \
(udata)->inlen = (ilen); \
(udata)->outlen = (olen); \
} while (0)