[PATCH v4 04/31] eventdev: fix variable shadowing issues

[Mattias Rönnblom]

On 1/14/26 16:44, Bruce Richardson wrote:
> Rename a macro variable to avoid shadowing conflicts, and reduce the
> scope of another variable for the same reason.
> 
> Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
> Fixes: 7f33abd49b26 ("eventdev/eth_rx: support appropriately report idle")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
> Acked-by: Stephen Hemminger <stephen at networkplumber.org>
> ---
>   lib/eventdev/rte_event_eth_rx_adapter.c | 5 ++---
>   lib/eventdev/rte_event_eth_tx_adapter.c | 8 ++++----
>   2 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
> index 994f256322..d564e14b72 100644
> --- a/lib/eventdev/rte_event_eth_rx_adapter.c
> +++ b/lib/eventdev/rte_event_eth_rx_adapter.c
> @@ -1191,7 +1191,6 @@ rxa_intr_thread(void *arg)
>   static inline bool
>   rxa_intr_ring_dequeue(struct event_eth_rx_adapter *rx_adapter)
>   {
> -	uint32_t n;
>   	uint32_t nb_rx = 0;
>   	int rxq_empty;
>   	struct eth_event_enqueue_buffer *buf;
> @@ -1260,9 +1259,9 @@ rxa_intr_ring_dequeue(struct event_eth_rx_adapter *rx_adapter)
>   		if (rxa_shared_intr(dev_info, queue)) {
>   			uint16_t i;
>   			uint16_t nb_queues;
> +			uint32_t n = 0;
>   
>   			nb_queues = dev_info->dev->data->nb_rx_queues;
> -			n = 0;
>   			for (i = dev_info->next_q_idx; i < nb_queues; i++) {
>   				uint8_t enq_buffer_full;
>   
> @@ -1289,7 +1288,7 @@ rxa_intr_ring_dequeue(struct event_eth_rx_adapter *rx_adapter)
>   						RTE_MAX_RXTX_INTR_VEC_ID - 1 :
>   						0;
>   		} else {
> -			n = rxa_eth_rx(rx_adapter, port, queue, nb_rx,
> +			uint32_t n = rxa_eth_rx(rx_adapter, port, queue, nb_rx,

Split 'n' definition and the function call.

With or without that fix,
Reviewed-by: Mattias Rönnblom <mattias.ronnblom at ericsson.com>

>   				rx_adapter->max_nb_rx,
>   				&rxq_empty, buf, stats);
>   			rx_adapter->qd_valid = !rxq_empty;
> diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
> index 83b6af0955..91c7be55c7 100644
> --- a/lib/eventdev/rte_event_eth_tx_adapter.c
> +++ b/lib/eventdev/rte_event_eth_tx_adapter.c
> @@ -64,11 +64,11 @@ do { \
>   
>   #define TXA_CHECK_OR_ERR_RET(id) \
>   do {\
> -	int ret; \
> +	int _ret; \
>   	RTE_EVENT_ETH_TX_ADAPTER_ID_VALID_OR_ERR_RET((id), -EINVAL); \
> -	ret = txa_init(); \
> -	if (ret != 0) \
> -		return ret; \
> +	_ret = txa_init(); \
> +	if (_ret != 0) \
> +		return _ret; \
>   	if (!txa_adapter_exist((id))) \
>   		return -EINVAL; \
>   } while (0)