Re: [PATCH 5/6] passt: Use NOLINT clang-tidy block instead of NOLINTNEXTLINE

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 1677 bytes --]

On Thu, Nov 07, 2024 at 07:43:30PM +0100, Stefano Brivio wrote:
> 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>

> ---
>  passt.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/passt.c b/passt.c
> index eaf231d..fac6101 100644
> --- a/passt.c
> +++ b/passt.c
> @@ -309,9 +309,10 @@ int main(int argc, char **argv)
>  	timer_init(&c, &now);
>  
>  loop:
> -	/* NOLINTNEXTLINE(bugprone-branch-clone): intervals can be the same */
> +	/* NOLINTBEGIN(bugprone-branch-clone): intervals can be the same */
>  	/* cppcheck-suppress [duplicateValueTernary, unmatchedSuppression] */
>  	nfds = epoll_wait(c.epollfd, events, EPOLL_EVENTS, TIMER_INTERVAL);
> +	/* NOLINTEND(bugprone-branch-clone) */
>  	if (nfds == -1 && errno != EINTR)
>  		die_perror("epoll_wait() failed in main loop");
>  

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]