F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant break after return

Browse Source
This commit is contained in:
Eduardo Almeida
2023-05-29 17:47:54 +01:00
parent 40754d3d9e
commit 6923de623c
21 changed files with 3 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/applications/model/three-gpp-http-client.cc
View File

@@ -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;
}
}

4
src/applications/model/three-gpp-http-server.cc
View File

@@ -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;
}
}

1
src/core/model/object-map.h
View File

@@ -102,7 +102,6 @@ MakeObjectMapAccessor(U T::*memberVector)
{
*index = (*j).first;
return (*j).second;
break;
}
}
NS_ASSERT(false);

1
src/core/model/object-vector.h
View File

@@ -102,7 +102,6 @@ MakeObjectVectorAccessor(U T::*memberVector)
{
*index = k;
return *j;
break;
}
}
NS_ASSERT(false);

4
src/core/model/timer.cc
View File

@@ -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;
}
}

4
src/lr-wpan/model/lr-wpan-mac-header.cc
View File

@@ -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;
}

9
src/lr-wpan/model/lr-wpan-mac-pl-headers.cc
View File

@@ -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;
}

1
src/lte/model/epc-ue-nas.cc
View File

@@ -222,7 +222,6 @@ EpcUeNas::Send(Ptr<Packet> packet, uint16_t protocolNumber)
default:
NS_LOG_WARN(this << " NAS OFF, discarding packet");
return false;
break;
}
}

8
src/lte/model/lte-enb-rrc.cc
View File

@@ -961,7 +961,6 @@ UeManager::SendData(uint8_t bid, Ptr<Packet> 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;
}
}

6
src/lte/model/lte-spectrum-phy.cc
View File

@@ -456,12 +456,10 @@ LteSpectrumPhy::StartTxDataFrame(Ptr<PacketBurst> 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<Ptr<LteControlMessage>> 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;
}
}

3
src/mobility/helper/ns2-mobility-helper.cc
View File

@@ -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 "";
}

4
src/network/utils/packetbb.cc
View File

@@ -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 */

2
src/spectrum/model/half-duplex-ideal-phy.cc
View File

@@ -302,9 +302,7 @@ HalfDuplexIdealPhy::StartTx(Ptr<Packet> p)
break;
case TX:
return true;
break;
}
return false;
}

3
src/wifi/model/ctrl-headers.cc
View File

@@ -1876,8 +1876,7 @@ CtrlTriggerHeader::GetTypeString(TriggerFrameType type)
{
#define FOO(x) \
case TriggerFrameType::x: \
return #x; \
break;
return #x;
switch (type)
{

4
src/wifi/model/qos-utils.cc
View File

@@ -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;
}

1
src/wifi/model/sta-wifi-mac.cc
View File

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

4
src/wifi/model/wifi-mac-header.cc
View File

@@ -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())
{

4
src/wifi/model/wifi-tx-timer.cc
View File

@@ -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);

4
src/wimax/model/service-flow.cc
View File

@@ -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");
}

14
src/wimax/model/simple-ofdm-wimax-phy.cc
View File

@@ -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");
}

6
src/wimax/model/wimax-connection.cc
View File

@@ -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");
}