On Fri, Jun 21, 2024 at 05:53:23PM +0200, Stefano Brivio wrote:
> cppcheck 2.14 warns that the scope of the rport variable could be
> reduced: do that, as reverted commit c80fa6a6bb44 ("udp: Make rport
> calculation more local") did, but keep the temporary variable of
> in_port_t type, otherwise the sum gets promoted to int.
> 
> Reported-by: David Gibson <david@gibson.dropbear.id.au>
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  udp.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/udp.c b/udp.c
> index 8181900..a854323 100644
> --- a/udp.c
> +++ b/udp.c
> @@ -279,10 +279,12 @@ static void udp_invert_portmap(struct udp_fwd_ports *fwd)
>  		      "Forward and reverse delta arrays must have same size");
>  	for (i = 0; i < ARRAY_SIZE(fwd->f.delta); i++) {
>  		in_port_t delta = fwd->f.delta[i];
> -		in_port_t rport = i + delta;
>  
> -		if (delta)
> +		if (delta) {
> +			in_port_t rport = i + delta;
> +
>  			fwd->rdelta[rport] = NUM_PORTS - delta;
> +		}
>  	}
>  }
>  

-- 
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