passt: Use NOLINT clang-tidy block instead of NOLINTNEXTLINE
For some reason, this is only reported by clang-tidy 19.1.2 on Alpine: /home/sbrivio/passt/passt.c:314:53: error: conditional operator with identical true and false expressions [bugprone-branch-clone,-warnings-as-errors] 314 | nfds = epoll_wait(c.epollfd, events, EPOLL_EVENTS, TIMER_INTERVAL); | ^ We do have a suppression, but not on the line preceding it, because we also need a cppcheck suppression there. Use NOLINTBEGIN/NOLINTEND for the clang-tidy suppression. Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
d4f09c9b96
commit
71869e2912
1 changed files with 2 additions and 1 deletions
3
passt.c
3
passt.c
|
@ -309,9 +309,10 @@ int main(int argc, char **argv)
|
||||||
timer_init(&c, &now);
|
timer_init(&c, &now);
|
||||||
|
|
||||||
loop:
|
loop:
|
||||||
/* NOLINTNEXTLINE(bugprone-branch-clone): intervals can be the same */
|
/* NOLINTBEGIN(bugprone-branch-clone): intervals can be the same */
|
||||||
/* cppcheck-suppress [duplicateValueTernary, unmatchedSuppression] */
|
/* cppcheck-suppress [duplicateValueTernary, unmatchedSuppression] */
|
||||||
nfds = epoll_wait(c.epollfd, events, EPOLL_EVENTS, TIMER_INTERVAL);
|
nfds = epoll_wait(c.epollfd, events, EPOLL_EVENTS, TIMER_INTERVAL);
|
||||||
|
/* NOLINTEND(bugprone-branch-clone) */
|
||||||
if (nfds == -1 && errno != EINTR)
|
if (nfds == -1 && errno != EINTR)
|
||||||
die_perror("epoll_wait() failed in main loop");
|
die_perror("epoll_wait() failed in main loop");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue