From 6923de623cf563677155fa03c464d03c4ef677f4 Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Mon, 29 May 2023 17:47:54 +0100 Subject: [PATCH] Remove redundant break after return --- src/applications/model/three-gpp-http-client.cc | 8 -------- src/applications/model/three-gpp-http-server.cc | 4 ---- src/core/model/object-map.h | 1 - src/core/model/object-vector.h | 1 - src/core/model/timer.cc | 4 ---- src/lr-wpan/model/lr-wpan-mac-header.cc | 4 ---- src/lr-wpan/model/lr-wpan-mac-pl-headers.cc | 9 --------- src/lte/model/epc-ue-nas.cc | 1 - src/lte/model/lte-enb-rrc.cc | 8 -------- src/lte/model/lte-spectrum-phy.cc | 6 ------ src/mobility/helper/ns2-mobility-helper.cc | 3 --- src/network/utils/packetbb.cc | 4 ---- src/spectrum/model/half-duplex-ideal-phy.cc | 2 -- src/wifi/model/ctrl-headers.cc | 3 +-- src/wifi/model/qos-utils.cc | 4 ---- src/wifi/model/sta-wifi-mac.cc | 1 - src/wifi/model/wifi-mac-header.cc | 4 +--- src/wifi/model/wifi-tx-timer.cc | 4 +--- src/wimax/model/service-flow.cc | 4 ---- src/wimax/model/simple-ofdm-wimax-phy.cc | 14 -------------- src/wimax/model/wimax-connection.cc | 6 ------ 21 files changed, 3 insertions(+), 92 deletions(-) diff --git a/src/applications/model/three-gpp-http-client.cc b/src/applications/model/three-gpp-http-client.cc index 53a6ee297..ecf837d49 100644 --- a/src/applications/model/three-gpp-http-client.cc +++ b/src/applications/model/three-gpp-http-client.cc @@ -169,29 +169,21 @@ ThreeGppHttpClient::GetStateString(ThreeGppHttpClient::State_t state) { case NOT_STARTED: return "NOT_STARTED"; - break; case CONNECTING: return "CONNECTING"; - break; case EXPECTING_MAIN_OBJECT: return "EXPECTING_MAIN_OBJECT"; - break; case PARSING_MAIN_OBJECT: return "PARSING_MAIN_OBJECT"; - break; case EXPECTING_EMBEDDED_OBJECT: return "EXPECTING_EMBEDDED_OBJECT"; - break; case READING: return "READING"; - break; case STOPPED: return "STOPPED"; - break; default: NS_FATAL_ERROR("Unknown state"); return "FATAL_ERROR"; - break; } } diff --git a/src/applications/model/three-gpp-http-server.cc b/src/applications/model/three-gpp-http-server.cc index 59bf9c8eb..f458a49bb 100644 --- a/src/applications/model/three-gpp-http-server.cc +++ b/src/applications/model/three-gpp-http-server.cc @@ -155,17 +155,13 @@ ThreeGppHttpServer::GetStateString(ThreeGppHttpServer::State_t state) { case NOT_STARTED: return "NOT_STARTED"; - break; case STARTED: return "STARTED"; - break; case STOPPED: return "STOPPED"; - break; default: NS_FATAL_ERROR("Unknown state"); return "FATAL_ERROR"; - break; } } diff --git a/src/core/model/object-map.h b/src/core/model/object-map.h index 091d844df..1adf11477 100644 --- a/src/core/model/object-map.h +++ b/src/core/model/object-map.h @@ -102,7 +102,6 @@ MakeObjectMapAccessor(U T::*memberVector) { *index = (*j).first; return (*j).second; - break; } } NS_ASSERT(false); diff --git a/src/core/model/object-vector.h b/src/core/model/object-vector.h index 9a63d0d41..30c03a414 100644 --- a/src/core/model/object-vector.h +++ b/src/core/model/object-vector.h @@ -102,7 +102,6 @@ MakeObjectVectorAccessor(U T::*memberVector) { *index = k; return *j; - break; } } NS_ASSERT(false); diff --git a/src/core/model/timer.cc b/src/core/model/timer.cc index 6a261ed8c..1fcba54c3 100644 --- a/src/core/model/timer.cc +++ b/src/core/model/timer.cc @@ -94,17 +94,13 @@ Timer::GetDelayLeft() const { case Timer::RUNNING: return Simulator::GetDelayLeft(m_event); - break; case Timer::EXPIRED: return TimeStep(0); - break; case Timer::SUSPENDED: return m_delayLeft; - break; default: NS_ASSERT(false); return TimeStep(0); - break; } } diff --git a/src/lr-wpan/model/lr-wpan-mac-header.cc b/src/lr-wpan/model/lr-wpan-mac-header.cc index e342cdb4b..396ae328b 100644 --- a/src/lr-wpan/model/lr-wpan-mac-header.cc +++ b/src/lr-wpan/model/lr-wpan-mac-header.cc @@ -65,16 +65,12 @@ LrWpanMacHeader::GetType() const { case 0: return LRWPAN_MAC_BEACON; - break; case 1: return LRWPAN_MAC_DATA; - break; case 2: return LRWPAN_MAC_ACKNOWLEDGMENT; - break; case 3: return LRWPAN_MAC_COMMAND; - break; default: return LRWPAN_MAC_RESERVED; } diff --git a/src/lr-wpan/model/lr-wpan-mac-pl-headers.cc b/src/lr-wpan/model/lr-wpan-mac-pl-headers.cc index bc24c3c64..bd19ae278 100644 --- a/src/lr-wpan/model/lr-wpan-mac-pl-headers.cc +++ b/src/lr-wpan/model/lr-wpan-mac-pl-headers.cc @@ -361,31 +361,22 @@ CommandPayloadHeader::GetCommandFrameType() const { case 0x01: return ASSOCIATION_REQ; - break; case 0x02: return ASSOCIATION_RESP; - break; case 0x03: return DISASSOCIATION_NOTIF; - break; case 0x04: return DATA_REQ; - break; case 0x05: return PANID_CONFLICT; - break; case 0x06: return ORPHAN_NOTIF; - break; case 0x07: return BEACON_REQ; - break; case 0x08: return COOR_REALIGN; - break; case 0x09: return GTS_REQ; - break; default: return CMD_RESERVED; } diff --git a/src/lte/model/epc-ue-nas.cc b/src/lte/model/epc-ue-nas.cc index 6a161202c..b00ba3246 100644 --- a/src/lte/model/epc-ue-nas.cc +++ b/src/lte/model/epc-ue-nas.cc @@ -222,7 +222,6 @@ EpcUeNas::Send(Ptr packet, uint16_t protocolNumber) default: NS_LOG_WARN(this << " NAS OFF, discarding packet"); return false; - break; } } diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc index b0af5d8a8..ebf990012 100644 --- a/src/lte/model/lte-enb-rrc.cc +++ b/src/lte/model/lte-enb-rrc.cc @@ -961,7 +961,6 @@ UeManager::SendData(uint8_t bid, Ptr p) case CONNECTION_SETUP: NS_LOG_WARN("not connected, discarding packet"); return; - break; case CONNECTED_NORMALLY: case CONNECTION_RECONFIGURATION: @@ -3313,15 +3312,12 @@ LteEnbRrc::GetRlcType(EpsBearer bearer) { case RLC_SM_ALWAYS: return LteRlcSm::GetTypeId(); - break; case RLC_UM_ALWAYS: return LteRlcUm::GetTypeId(); - break; case RLC_AM_ALWAYS: return LteRlcAm::GetTypeId(); - break; case PER_BASED: if (bearer.GetPacketErrorLossRate() > 1.0e-5) @@ -3332,11 +3328,9 @@ LteEnbRrc::GetRlcType(EpsBearer bearer) { return LteRlcAm::GetTypeId(); } - break; default: return LteRlcSm::GetTypeId(); - break; } } @@ -3557,10 +3551,8 @@ LteEnbRrc::IsRandomAccessCompleted(uint16_t rnti) case UeManager::CONNECTED_NORMALLY: case UeManager::CONNECTION_RECONFIGURATION: return true; - break; default: return false; - break; } } diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc index ae74673e3..680969b6b 100644 --- a/src/lte/model/lte-spectrum-phy.cc +++ b/src/lte/model/lte-spectrum-phy.cc @@ -456,12 +456,10 @@ LteSpectrumPhy::StartTxDataFrame(Ptr pb, m_endTxEvent = Simulator::Schedule(duration, &LteSpectrumPhy::EndTxData, this); } return false; - break; default: NS_FATAL_ERROR("unknown state"); return true; - break; } } @@ -514,12 +512,10 @@ LteSpectrumPhy::StartTxDlCtrlFrame(std::list> ctrlMsgList m_endTxEvent = Simulator::Schedule(DL_CTRL_DURATION, &LteSpectrumPhy::EndTxDlCtrl, this); } return false; - break; default: NS_FATAL_ERROR("unknown state"); return true; - break; } } @@ -570,12 +566,10 @@ LteSpectrumPhy::StartTxUlSrsFrame() m_endTxEvent = Simulator::Schedule(UL_SRS_DURATION, &LteSpectrumPhy::EndTxUlSrs, this); } return false; - break; default: NS_FATAL_ERROR("unknown state"); return true; - break; } } diff --git a/src/mobility/helper/ns2-mobility-helper.cc b/src/mobility/helper/ns2-mobility-helper.cc index 05ed8e967..9a0fe0f88 100644 --- a/src/mobility/helper/ns2-mobility-helper.cc +++ b/src/mobility/helper/ns2-mobility-helper.cc @@ -700,13 +700,10 @@ GetNodeIdString(ParseResult pr) { case 4: // line like $node_(0) set X_ 11 return pr.svals[0]; - break; case 7: // line like $ns_ at 4 "$node_(0) set X_ 28" return pr.svals[3]; - break; case 8: // line like $ns_ at 1 "$node_(0) setdest 2 3 4" return pr.svals[3]; - break; default: return ""; } diff --git a/src/network/utils/packetbb.cc b/src/network/utils/packetbb.cc index df35a2b86..751da7fcd 100644 --- a/src/network/utils/packetbb.cc +++ b/src/network/utils/packetbb.cc @@ -1508,7 +1508,6 @@ PbbMessage::DeserializeMessage(Buffer::Iterator& start) break; default: return nullptr; - break; } newmsg->Deserialize(start); return newmsg; @@ -2434,13 +2433,10 @@ PbbAddressBlock::GetPrefixFlags() const { case 0: return 0; - break; case 1: return AHAS_SINGLE_PRE_LEN; - break; default: return AHAS_MULTI_PRE_LEN; - break; } /* Quiet compiler */ diff --git a/src/spectrum/model/half-duplex-ideal-phy.cc b/src/spectrum/model/half-duplex-ideal-phy.cc index 817b504be..87b23a3fe 100644 --- a/src/spectrum/model/half-duplex-ideal-phy.cc +++ b/src/spectrum/model/half-duplex-ideal-phy.cc @@ -302,9 +302,7 @@ HalfDuplexIdealPhy::StartTx(Ptr p) break; case TX: - return true; - break; } return false; } diff --git a/src/wifi/model/ctrl-headers.cc b/src/wifi/model/ctrl-headers.cc index 2cc36b511..99927a924 100644 --- a/src/wifi/model/ctrl-headers.cc +++ b/src/wifi/model/ctrl-headers.cc @@ -1876,8 +1876,7 @@ CtrlTriggerHeader::GetTypeString(TriggerFrameType type) { #define FOO(x) \ case TriggerFrameType::x: \ - return #x; \ - break; + return #x; switch (type) { diff --git a/src/wifi/model/qos-utils.cc b/src/wifi/model/qos-utils.cc index 1be557295..9cb69e1f0 100644 --- a/src/wifi/model/qos-utils.cc +++ b/src/wifi/model/qos-utils.cc @@ -139,19 +139,15 @@ QosUtilsMapTidToAc(uint8_t tid) case 0: case 3: return AC_BE; - break; case 1: case 2: return AC_BK; - break; case 4: case 5: return AC_VI; - break; case 6: case 7: return AC_VO; - break; } return AC_UNDEF; } diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc index c126d8d6f..bbbe78ab7 100644 --- a/src/wifi/model/sta-wifi-mac.cc +++ b/src/wifi/model/sta-wifi-mac.cc @@ -529,7 +529,6 @@ StaWifiMac::TryToEnsureAssociated() { case ASSOCIATED: return; - break; case SCANNING: /* we have initiated active or passive scanning, continue to wait and gather beacons or probe responses until the scanning timeout diff --git a/src/wifi/model/wifi-mac-header.cc b/src/wifi/model/wifi-mac-header.cc index 64301cb56..63f25c65a 100644 --- a/src/wifi/model/wifi-mac-header.cc +++ b/src/wifi/model/wifi-mac-header.cc @@ -664,7 +664,6 @@ WifiMacHeader::IsCfAck() const return true; default: return false; - break; } } @@ -1047,8 +1046,7 @@ WifiMacHeader::GetTypeString() const { #define FOO(x) \ case WIFI_MAC_##x: \ - return #x; \ - break; + return #x; switch (GetType()) { diff --git a/src/wifi/model/wifi-tx-timer.cc b/src/wifi/model/wifi-tx-timer.cc index 6fcefce8b..07e855a6a 100644 --- a/src/wifi/model/wifi-tx-timer.cc +++ b/src/wifi/model/wifi-tx-timer.cc @@ -96,14 +96,12 @@ WifiTxTimer::GetReasonString(Reason reason) const { #define FOO(x) \ case WAIT_##x: \ - return #x; \ - break; + return #x; switch (reason) { case NOT_RUNNING: return "NOT_RUNNING"; - break; FOO(CTS); FOO(NORMAL_ACK); FOO(BLOCK_ACK); diff --git a/src/wimax/model/service-flow.cc b/src/wimax/model/service-flow.cc index c30677d81..33b7eb2f1 100644 --- a/src/wimax/model/service-flow.cc +++ b/src/wimax/model/service-flow.cc @@ -827,16 +827,12 @@ ServiceFlow::GetSchedulingTypeStr() const { case SF_TYPE_UGS: return (char*)"UGS"; - break; case SF_TYPE_RTPS: return (char*)"rtPS"; - break; case SF_TYPE_NRTPS: return (char*)"nrtPS"; - break; case SF_TYPE_BE: return (char*)"BE"; - break; default: NS_FATAL_ERROR("Invalid scheduling type"); } diff --git a/src/wimax/model/simple-ofdm-wimax-phy.cc b/src/wimax/model/simple-ofdm-wimax-phy.cc index 65f17f655..6a73e18e0 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.cc +++ b/src/wimax/model/simple-ofdm-wimax-phy.cc @@ -690,25 +690,18 @@ SimpleOfdmWimaxPhy::DoGetDataRate(WimaxPhy::ModulationType modulationType) const { case MODULATION_TYPE_BPSK_12: return m_dataRateBpsk12; - break; case MODULATION_TYPE_QPSK_12: return m_dataRateQpsk12; - break; case MODULATION_TYPE_QPSK_34: return m_dataRateQpsk34; - break; case MODULATION_TYPE_QAM16_12: return m_dataRateQam16_12; - break; case MODULATION_TYPE_QAM16_34: return m_dataRateQam16_34; - break; case MODULATION_TYPE_QAM64_23: return m_dataRateQam64_23; - break; case MODULATION_TYPE_QAM64_34: return m_dataRateQam64_34; - break; } NS_FATAL_ERROR("Invalid modulation type"); return 0; @@ -893,25 +886,18 @@ SimpleOfdmWimaxPhy::DoGetFrameDuration(uint8_t frameDurationCode) const { case FRAME_DURATION_2_POINT_5_MS: return Seconds(2.5); - break; case FRAME_DURATION_4_MS: return Seconds(4); - break; case FRAME_DURATION_5_MS: return Seconds(5); - break; case FRAME_DURATION_8_MS: return Seconds(8); - break; case FRAME_DURATION_10_MS: return Seconds(10); - break; case FRAME_DURATION_12_POINT_5_MS: return Seconds(12.5); - break; case FRAME_DURATION_20_MS: return Seconds(20); - break; default: NS_FATAL_ERROR("Invalid modulation type"); } diff --git a/src/wimax/model/wimax-connection.cc b/src/wimax/model/wimax-connection.cc index d719fd2b5..61e40c70e 100644 --- a/src/wimax/model/wimax-connection.cc +++ b/src/wimax/model/wimax-connection.cc @@ -161,22 +161,16 @@ WimaxConnection::GetTypeStr() const { case Cid::BROADCAST: return "Broadcast"; - break; case Cid::INITIAL_RANGING: return "Initial Ranging"; - break; case Cid::BASIC: return "Basic"; - break; case Cid::PRIMARY: return "Primary"; - break; case Cid::TRANSPORT: return "Transport"; - break; case Cid::MULTICAST: return "Multicast"; - break; default: NS_FATAL_ERROR("Invalid connection type"); }