From 453dd706129faf02473a2f625ebea1863b91cc4b Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Tue, 11 Oct 2022 11:21:54 +0100 Subject: [PATCH] core, internet, sixlowpan: Declare unused variables as [[maybe_unused]] --- src/core/model/attribute.cc | 18 +++++++----------- src/core/test/type-id-test-suite.cc | 4 ++-- .../test/ipv4-global-routing-test-suite.cc | 6 +----- src/internet/test/ipv4-rip-test.cc | 19 +++---------------- .../test/ipv4-static-routing-test-suite.cc | 6 +----- src/internet/test/ipv6-forwarding-test.cc | 6 +----- src/internet/test/ipv6-ripng-test.cc | 19 +++---------------- src/internet/test/tcp-error-model.cc | 4 +--- src/internet/test/tcp-general-test.cc | 3 +-- src/internet/test/udp-test.cc | 18 +++--------------- src/sixlowpan/test/sixlowpan-hc1-test.cc | 6 +----- src/sixlowpan/test/sixlowpan-iphc-test.cc | 6 +----- 12 files changed, 25 insertions(+), 90 deletions(-) diff --git a/src/core/model/attribute.cc b/src/core/model/attribute.cc index dc1ffa036..eb2ec06ed 100644 --- a/src/core/model/attribute.cc +++ b/src/core/model/attribute.cc @@ -126,18 +126,16 @@ EmptyAttributeAccessor::~EmptyAttributeAccessor() } bool -EmptyAttributeAccessor::Set(ObjectBase* object, const AttributeValue& value) const +EmptyAttributeAccessor::Set(ObjectBase* object [[maybe_unused]], + const AttributeValue& value [[maybe_unused]]) const { - (void)object; - (void)value; return true; } bool -EmptyAttributeAccessor::Get(const ObjectBase* object, AttributeValue& attribute) const +EmptyAttributeAccessor::Get(const ObjectBase* object [[maybe_unused]], + AttributeValue& attribute [[maybe_unused]]) const { - (void)object; - (void)attribute; return true; } @@ -163,9 +161,8 @@ EmptyAttributeChecker::~EmptyAttributeChecker() } bool -EmptyAttributeChecker::Check(const AttributeValue& value) const +EmptyAttributeChecker::Check(const AttributeValue& value [[maybe_unused]]) const { - (void)value; return true; } @@ -195,10 +192,9 @@ EmptyAttributeChecker::Create() const } bool -EmptyAttributeChecker::Copy(const AttributeValue& source, AttributeValue& destination) const +EmptyAttributeChecker::Copy(const AttributeValue& source [[maybe_unused]], + AttributeValue& destination [[maybe_unused]]) const { - (void)source; - (void)destination; return true; } diff --git a/src/core/test/type-id-test-suite.cc b/src/core/test/type-id-test-suite.cc index da1f023c0..1371ab2df 100644 --- a/src/core/test/type-id-test-suite.cc +++ b/src/core/test/type-id-test-suite.cc @@ -398,7 +398,7 @@ LookupTimeTestCase::DoRun() for (uint16_t i = 0; i < nids; ++i) { const TypeId tid = TypeId::GetRegistered(i); - const TypeId sid = TypeId::LookupByName(tid.GetName()); + const TypeId sid [[maybe_unused]] = TypeId::LookupByName(tid.GetName()); } } int stop = clock(); @@ -410,7 +410,7 @@ LookupTimeTestCase::DoRun() for (uint16_t i = 0; i < nids; ++i) { const TypeId tid = TypeId::GetRegistered(i); - const TypeId sid = TypeId::LookupByHash(tid.GetHash()); + const TypeId sid [[maybe_unused]] = TypeId::LookupByHash(tid.GetHash()); } } stop = clock(); diff --git a/src/internet/test/ipv4-global-routing-test-suite.cc b/src/internet/test/ipv4-global-routing-test-suite.cc index 11b095585..6c32f9838 100644 --- a/src/internet/test/ipv4-global-routing-test-suite.cc +++ b/src/internet/test/ipv4-global-routing-test-suite.cc @@ -1207,15 +1207,11 @@ Ipv4GlobalRoutingSlash32TestCase::~Ipv4GlobalRoutingSlash32TestCase() void Ipv4GlobalRoutingSlash32TestCase::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "Received packet size is not equal to Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void diff --git a/src/internet/test/ipv4-rip-test.cc b/src/internet/test/ipv4-rip-test.cc index b60b0a684..464786983 100644 --- a/src/internet/test/ipv4-rip-test.cc +++ b/src/internet/test/ipv4-rip-test.cc @@ -87,15 +87,11 @@ Ipv4RipTest::Ipv4RipTest() void Ipv4RipTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "Received Packet size is not equal to the Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void @@ -321,15 +317,11 @@ Ipv4RipCountToInfinityTest::Ipv4RipCountToInfinityTest() void Ipv4RipCountToInfinityTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "Received Packet size is not equal to the Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void @@ -553,8 +545,7 @@ Ipv4RipSplitHorizonStrategyTest::Ipv4RipSplitHorizonStrategyTest(Rip::SplitHoriz void Ipv4RipSplitHorizonStrategyTest::ReceivePktProbe(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); Address srcAddr; Ptr receivedPacketProbe = socket->RecvFrom(std::numeric_limits::max(), 0, srcAddr); @@ -592,10 +583,6 @@ Ipv4RipSplitHorizonStrategyTest::ReceivePktProbe(Ptr socket) } } } - - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void diff --git a/src/internet/test/ipv4-static-routing-test-suite.cc b/src/internet/test/ipv4-static-routing-test-suite.cc index 454e62e56..35ea5abbe 100644 --- a/src/internet/test/ipv4-static-routing-test-suite.cc +++ b/src/internet/test/ipv4-static-routing-test-suite.cc @@ -88,15 +88,11 @@ Ipv4StaticRoutingSlash32TestCase::~Ipv4StaticRoutingSlash32TestCase() void Ipv4StaticRoutingSlash32TestCase::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "Received packet size is not equal to Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void diff --git a/src/internet/test/ipv6-forwarding-test.cc b/src/internet/test/ipv6-forwarding-test.cc index 1e680dc49..cee64f081 100644 --- a/src/internet/test/ipv6-forwarding-test.cc +++ b/src/internet/test/ipv6-forwarding-test.cc @@ -85,15 +85,11 @@ Ipv6ForwardingTest::Ipv6ForwardingTest() void Ipv6ForwardingTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "Received packet size is not equal to Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void diff --git a/src/internet/test/ipv6-ripng-test.cc b/src/internet/test/ipv6-ripng-test.cc index efb713220..c34f47011 100644 --- a/src/internet/test/ipv6-ripng-test.cc +++ b/src/internet/test/ipv6-ripng-test.cc @@ -86,15 +86,11 @@ Ipv6RipngTest::Ipv6RipngTest() void Ipv6RipngTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "Received packet size is not equal to Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void @@ -321,15 +317,11 @@ Ipv6RipngCountToInfinityTest::Ipv6RipngCountToInfinityTest() void Ipv6RipngCountToInfinityTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "Received packet size is not equal to Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void @@ -552,8 +544,7 @@ Ipv6RipngSplitHorizonStrategyTest::Ipv6RipngSplitHorizonStrategyTest( void Ipv6RipngSplitHorizonStrategyTest::ReceivePktProbe(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); Address srcAddr; Ptr receivedPacketProbe = socket->RecvFrom(std::numeric_limits::max(), 0, srcAddr); @@ -590,10 +581,6 @@ Ipv6RipngSplitHorizonStrategyTest::ReceivePktProbe(Ptr socket) } } } - - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void diff --git a/src/internet/test/tcp-error-model.cc b/src/internet/test/tcp-error-model.cc index 8bb3b51b2..434332222 100644 --- a/src/internet/test/tcp-error-model.cc +++ b/src/internet/test/tcp-error-model.cc @@ -132,12 +132,10 @@ TcpFlagErrorModel::TcpFlagErrorModel() bool TcpFlagErrorModel::ShouldDrop(const Ipv4Header& ipHeader, const TcpHeader& tcpHeader, - uint32_t packetSize) + uint32_t packetSize [[maybe_unused]]) { NS_LOG_FUNCTION(this << ipHeader << tcpHeader); - (void)packetSize; - bool toDrop = false; if ((tcpHeader.GetFlags() & m_flagsToKill) == m_flagsToKill) diff --git a/src/internet/test/tcp-general-test.cc b/src/internet/test/tcp-general-test.cc index ec29d0265..26165a5ce 100644 --- a/src/internet/test/tcp-general-test.cc +++ b/src/internet/test/tcp-general-test.cc @@ -271,9 +271,8 @@ TcpGeneralTest::DoConnect() } void -TcpGeneralTest::HandleAccept(Ptr socket, const Address& from) +TcpGeneralTest::HandleAccept(Ptr socket, const Address& from [[maybe_unused]]) { - (void)from; socket->SetRecvCallback(MakeCallback(&TcpGeneralTest::ReceivePacket, this)); socket->SetCloseCallbacks(MakeCallback(&TcpGeneralTest::NormalCloseCb, this), MakeCallback(&TcpGeneralTest::ErrorCloseCb, this)); diff --git a/src/internet/test/udp-test.cc b/src/internet/test/udp-test.cc index 71bcdcca2..42d43ec9a 100644 --- a/src/internet/test/udp-test.cc +++ b/src/internet/test/udp-test.cc @@ -142,15 +142,11 @@ Udp6SocketLoopbackTest::Udp6SocketLoopbackTest() void Udp6SocketLoopbackTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "ReceivedPacket size is not equal to the Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void @@ -601,29 +597,21 @@ Udp6SocketImplTest::ReceivePacket2(Ptr socket, Ptr packet, const void Udp6SocketImplTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket->GetSize(), "ReceivedPacket size is not equal to the Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void Udp6SocketImplTest::ReceivePkt2(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket2 = socket->Recv(std::numeric_limits::max(), 0); NS_TEST_ASSERT_MSG_EQ(availableData, m_receivedPacket2->GetSize(), "ReceivedPacket size is not equal to the Rx buffer size"); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void diff --git a/src/sixlowpan/test/sixlowpan-hc1-test.cc b/src/sixlowpan/test/sixlowpan-hc1-test.cc index e266e0641..8b425641a 100644 --- a/src/sixlowpan/test/sixlowpan-hc1-test.cc +++ b/src/sixlowpan/test/sixlowpan-hc1-test.cc @@ -96,13 +96,9 @@ SixlowpanHc1ImplTest::ReceivePacket(Ptr socket, Ptr packet, cons void SixlowpanHc1ImplTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_ASSERT(availableData == m_receivedPacket->GetSize()); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void diff --git a/src/sixlowpan/test/sixlowpan-iphc-test.cc b/src/sixlowpan/test/sixlowpan-iphc-test.cc index b19625c12..e1c8a8d64 100644 --- a/src/sixlowpan/test/sixlowpan-iphc-test.cc +++ b/src/sixlowpan/test/sixlowpan-iphc-test.cc @@ -96,13 +96,9 @@ SixlowpanIphcImplTest::ReceivePacket(Ptr socket, Ptr packet, con void SixlowpanIphcImplTest::ReceivePkt(Ptr socket) { - uint32_t availableData; - availableData = socket->GetRxAvailable(); + uint32_t availableData [[maybe_unused]] = socket->GetRxAvailable(); m_receivedPacket = socket->Recv(std::numeric_limits::max(), 0); NS_ASSERT(availableData == m_receivedPacket->GetSize()); - // cast availableData to void, to suppress 'availableData' set but not used - // compiler warning - (void)availableData; } void