From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9EEC9489DB; Thu, 6 Nov 2025 15:10:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7833740668; Thu, 6 Nov 2025 15:10:08 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by mails.dpdk.org (Postfix) with ESMTP id 630C64013F; Thu, 6 Nov 2025 15:10:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1762438207; x=1793974207; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ry52tCfvYqMdmKr2C4SmUa+7d/2HivS8r6thiYy7lg4=; b=geQ/AcHVmR2KNNbTGM20vLcsOk5E4sX/182zlCgTv3G2lCsQ/8bGF7CM hGl+umu30RgcS8URyjB36pPJD8xCbZBZOwhaWnUVObXhb7iFdsc+P4f7/ n9ehKICOAX76qc+1G6fERTYKoMXwgJavZWHKb7UKWEC2uDcm3PSFEptI5 xwsxTBXF7isl+/M/JHdDhs5jFapxvcxv04i6vVBsvVxbL09AX/V9Y9f5q CMRffF8n6Qan7ZJaQQp+7xDD+FOfTfbKB4fnJKZCRqHHwNdC8Z2BRRnyy 1o+K4aH6gTyCSYCJAt0EpaZnouqpIgt2oI7u9prhUD0X8hJXnJdIYCqRf A==; X-CSE-ConnectionGUID: 7SgPd0C+QTO0zserZecNew== X-CSE-MsgGUID: lUchnexZSXmUs/u/q4+Qww== X-IronPort-AV: E=McAfee;i="6800,10657,11604"; a="67185296" X-IronPort-AV: E=Sophos;i="6.19,284,1754982000"; d="scan'208";a="67185296" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Nov 2025 06:10:06 -0800 X-CSE-ConnectionGUID: XHoR8H1nRA2hQPHKzFIQYw== X-CSE-MsgGUID: Z4KYOfLjSF660C3Px7z7GQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,284,1754982000"; d="scan'208";a="187054709" Received: from silpixa00401385.ir.intel.com ([10.20.224.226]) by orviesa010.jf.intel.com with ESMTP; 06 Nov 2025 06:10:05 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , stable@dpdk.org Subject: [RFC PATCH 03/19] eventdev: fix variable shadowing issues Date: Thu, 6 Nov 2025 14:09:32 +0000 Message-ID: <20251106140948.2894678-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251106140948.2894678-1-bruce.richardson@intel.com> References: <20251106140948.2894678-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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@dpdk.org Signed-off-by: Bruce Richardson --- 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, 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) -- 2.48.1