From 53aaf514adc8e508502be23689bea06ace8434d6 Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Tue, 11 Mar 2025 15:52:38 +0000 Subject: [PATCH] csma: Reduce nested code by using early return --- src/csma/model/csma-channel.cc | 35 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/src/csma/model/csma-channel.cc b/src/csma/model/csma-channel.cc index c04c230bb..5f4c03ab1 100644 --- a/src/csma/model/csma-channel.cc +++ b/src/csma/model/csma-channel.cc @@ -119,28 +119,25 @@ CsmaChannel::Detach(uint32_t deviceId) { NS_LOG_FUNCTION(this << deviceId); - if (deviceId < m_deviceList.size()) - { - if (!m_deviceList[deviceId].active) - { - NS_LOG_WARN("CsmaChannel::Detach(): Device is already detached (" << deviceId << ")"); - return false; - } - - m_deviceList[deviceId].active = false; - - if ((m_state == TRANSMITTING) && (m_currentSrc == deviceId)) - { - NS_LOG_WARN("CsmaChannel::Detach(): Device is currently transmitting (" << deviceId - << ")"); - } - - return true; - } - else + if (deviceId >= m_deviceList.size()) { return false; } + + if (!m_deviceList[deviceId].active) + { + NS_LOG_WARN("CsmaChannel::Detach(): Device is already detached (" << deviceId << ")"); + return false; + } + + m_deviceList[deviceId].active = false; + + if ((m_state == TRANSMITTING) && (m_currentSrc == deviceId)) + { + NS_LOG_WARN("CsmaChannel::Detach(): Device is currently transmitting (" << deviceId << ")"); + } + + return true; } bool