clang-tidy, at least as of 22.1.4 complains about if/else statements with
inconsistent braces. We generally do want consistend bracing per our
coding style. However, some of our foreach macros generate inconsistent
bracing in a way that can't really be avoided. Add suppressions to stop
clang-tidy complaining about these.
Signed-off-by: David Gibson
---
flow.c | 2 ++
flow_table.h | 8 ++++++--
netlink.c | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/flow.c b/flow.c
index 91f2b81f..565ed2b2 100644
--- a/flow.c
+++ b/flow.c
@@ -67,9 +67,11 @@ static_assert(ARRAY_SIZE(flow_epoll) == FLOW_NUM_TYPES,
#define foreach_established_tcp_flow(flow) \
flow_foreach_of_type((flow), FLOW_TCP) \
+ /* NOLINTNEXTLINE(readability-inconsistent-ifelse-braces) */\
if (!tcp_flow_is_established(&(flow)->tcp)) \
/* NOLINTNEXTLINE(bugprone-branch-clone) */ \
continue; \
+ /* NOLINTNEXTLINE(readability-inconsistent-ifelse-braces) */\
else
/* Global Flow Table */
diff --git a/flow_table.h b/flow_table.h
index 7694e726..e4ff6f73 100644
--- a/flow_table.h
+++ b/flow_table.h
@@ -67,8 +67,10 @@ extern union flow flowtab[];
*/
#define flow_foreach(flow) \
flow_foreach_slot((flow)) \
+ /* NOLINTNEXTLINE(readability-inconsistent-ifelse-braces) */\
if ((flow)->f.state == FLOW_STATE_FREE) \
(flow) += (flow)->free.n - 1; \
+ /* NOLINTNEXTLINE(readability-inconsistent-ifelse-braces) */\
else if ((flow)->f.state != FLOW_STATE_ACTIVE) { \
flow_err((flow), "Bad flow state during traversal"); \
continue; \
@@ -81,10 +83,12 @@ extern union flow flowtab[];
*/
#define flow_foreach_of_type(flow, type_) \
flow_foreach((flow)) \
- if ((flow)->f.type != (type_)) \
+ /* NOLINTNEXTLINE(readability-inconsistent-ifelse-braces) */\
+ if ((flow)->f.type != (type_)) \
/* NOLINTNEXTLINE(bugprone-branch-clone) */ \
continue; \
- else
+ /* NOLINTNEXTLINE(readability-inconsistent-ifelse-braces) */\
+ else \
/** flow_idx() - Index of flow from common structure
diff --git a/netlink.c b/netlink.c
index 9076462b..c3c830e1 100644
--- a/netlink.c
+++ b/netlink.c
@@ -224,6 +224,7 @@ static struct nlmsghdr *nl_next(int s, char *buf, struct nlmsghdr *nh, ssize_t *
nl_foreach((nh), (status), (s), (buf), (seq)) \
if ((nh)->nlmsg_type != (type)) { \
warn("netlink: Unexpected message type"); \
+ /* NOLINTNEXTLINE(readability-inconsistent-ifelse-braces) */\
} else
/**
--
2.54.0