From 612e10e66477106ceef17da04878f8c3127bb3f9 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Wed, 6 May 2020 11:41:23 -0700 Subject: [PATCH] [error] add missing IgnoreError (#4931) --- src/core/thread/mle.cpp | 2 +- src/core/thread/mle_router.cpp | 2 +- src/ncp/ncp_base.cpp | 4 ++-- tests/unit/test_aes.cpp | 12 ++++++------ tests/unit/test_link_quality.cpp | 18 +++++++++--------- tests/unit/test_lowpan.cpp | 2 +- tests/unit/test_lowpan.hpp | 9 +++++---- tests/unit/test_netif.cpp | 27 ++++++++++++++------------- tests/unit/test_string.cpp | 2 +- 9 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index 5a069f130..77480be0b 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -807,7 +807,7 @@ void Mle::SetStateChild(uint16_t aRloc16) #endif #if OPENTHREAD_CONFIG_MLE_INFORM_PREVIOUS_PARENT_ON_REATTACH - InformPreviousParent(); + IgnoreError(InformPreviousParent()); mPreviousParentRloc = mParent.GetRloc16(); #endif } diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 1adade15a..1b713fc2d 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -1886,7 +1886,7 @@ void MleRouter::HandleStateUpdateTimer(void) if (age < Time::SecToMsec(kMaxNeighborAge) + kMaxTransmissionCount * kUnicastRetransmissionDelay) { otLogInfoMle("Router timeout expired"); - SendLinkRequest(&router); + IgnoreError(SendLinkRequest(&router)); } else { diff --git a/src/ncp/ncp_base.cpp b/src/ncp/ncp_base.cpp index 3f705b436..1eb4560cc 100644 --- a/src/ncp/ncp_base.cpp +++ b/src/ncp/ncp_base.cpp @@ -1942,13 +1942,13 @@ template <> otError NcpBase::HandlePropertySet(void { if (otThreadGetDeviceRole(mInstance) != OT_DEVICE_ROLE_DISABLED) { - otThreadSetEnabled(mInstance, false); + IgnoreError(otThreadSetEnabled(mInstance, false)); StopLegacy(); } if (otIp6IsEnabled(mInstance)) { - otIp6SetEnabled(mInstance, false); + IgnoreError(otIp6SetEnabled(mInstance, false)); } } #endif // #if OPENTHREAD_FTD || OPENTHREAD_MTD diff --git a/tests/unit/test_aes.cpp b/tests/unit/test_aes.cpp index b8027af6c..b6359cbd8 100644 --- a/tests/unit/test_aes.cpp +++ b/tests/unit/test_aes.cpp @@ -68,13 +68,13 @@ void TestMacBeaconFrame(void) VerifyOrQuit(instance != NULL, "Null OpenThread instance"); aesCcm.SetKey(key, sizeof(key)); - aesCcm.Init(headerLength, payloadLength, tagLength, nonce, sizeof(nonce)); + SuccessOrQuit(aesCcm.Init(headerLength, payloadLength, tagLength, nonce, sizeof(nonce)), "AesCcm::Init() failed"); aesCcm.Header(test, headerLength); aesCcm.Finalize(test + headerLength, &tagLength); VerifyOrQuit(memcmp(test, encrypted, sizeof(encrypted)) == 0, "TestMacBeaconFrame encrypt failed"); - aesCcm.Init(headerLength, payloadLength, tagLength, nonce, sizeof(nonce)); + SuccessOrQuit(aesCcm.Init(headerLength, payloadLength, tagLength, nonce, sizeof(nonce)), "AesCcm::Init() failed"); aesCcm.Header(test, headerLength); aesCcm.Finalize(test + headerLength, &tagLength); @@ -119,18 +119,18 @@ void TestMacCommandFrame() ot::Crypto::AesCcm aesCcm; aesCcm.SetKey(key, sizeof(key)); - aesCcm.Init(headerLength, payloadLength, tagLength, nonce, sizeof(nonce)); + SuccessOrQuit(aesCcm.Init(headerLength, payloadLength, tagLength, nonce, sizeof(nonce)), "AesCcm::Init() failed"); aesCcm.Header(test, headerLength); aesCcm.Payload(test + headerLength, test + headerLength, payloadLength, true); aesCcm.Finalize(test + headerLength + payloadLength, &tagLength); - VerifyOrQuit(memcmp(test, encrypted, sizeof(encrypted)) == 0, "TestMacCommandFrame encrypt failed\n"); + VerifyOrQuit(memcmp(test, encrypted, sizeof(encrypted)) == 0, "TestMacCommandFrame encrypt failed"); - aesCcm.Init(headerLength, payloadLength, tagLength, nonce, sizeof(nonce)); + SuccessOrQuit(aesCcm.Init(headerLength, payloadLength, tagLength, nonce, sizeof(nonce)), "AesCcm::Init() failed"); aesCcm.Header(test, headerLength); aesCcm.Payload(test + headerLength, test + headerLength, payloadLength, false); aesCcm.Finalize(test + headerLength + payloadLength, &tagLength); - VerifyOrQuit(memcmp(test, decrypted, sizeof(decrypted)) == 0, "TestMacCommandFrame decrypt failed\n"); + VerifyOrQuit(memcmp(test, decrypted, sizeof(decrypted)) == 0, "TestMacCommandFrame decrypt failed"); } int main(void) diff --git a/tests/unit/test_link_quality.cpp b/tests/unit/test_link_quality.cpp index 6a6b46871..0f93e78f8 100644 --- a/tests/unit/test_link_quality.cpp +++ b/tests/unit/test_link_quality.cpp @@ -174,7 +174,7 @@ void TestRssAveraging(void) // Adding a single value rss = -70; printf("AddRss(%d): ", rss); - rssAverager.Add(rss); + IgnoreError(rssAverager.Add(rss)); VerifyOrQuit(rssAverager.GetAverage() == rss, "TestLinkQualityInfo - GetAverage() failed after a single AddRss()."); VerifyRawRssValue(rssAverager); PrintOutcome(rssAverager); @@ -202,7 +202,7 @@ void TestRssAveraging(void) for (i = 0; i < kNumRssAdds; i++) { - rssAverager.Add(rss); + IgnoreError(rssAverager.Add(rss)); VerifyOrQuit(rssAverager.GetAverage() == rss, "TestLinkQualityInfo failed - GetAverage() returned incorrect value."); VerifyRawRssValue(rssAverager); @@ -229,8 +229,8 @@ void TestRssAveraging(void) rss2 = rssValues[k]; rssAverager.Reset(); - rssAverager.Add(rss); - rssAverager.Add(rss2); + IgnoreError(rssAverager.Add(rss)); + IgnoreError(rssAverager.Add(rss2)); printf("AddRss(%4d), AddRss(%4d): ", rss, rss2); VerifyOrQuit(rssAverager.GetAverage() == ((rss + rss2) >> 1), "TestLinkQualityInfo failed - GetAverage() returned incorrect value."); @@ -260,10 +260,10 @@ void TestRssAveraging(void) for (i = 0; i < kNumRssAdds; i++) { - rssAverager.Add(rss); + IgnoreError(rssAverager.Add(rss)); } - rssAverager.Add(rss2); + IgnoreError(rssAverager.Add(rss2)); printf("AddRss(%4d) %d times, AddRss(%4d): ", rss, kNumRssAdds, rss2); ave = rssAverager.GetAverage(); VerifyOrQuit(ave >= MIN_RSS(rss, rss2), @@ -296,8 +296,8 @@ void TestRssAveraging(void) for (i = 0; i < kNumRssAdds; i++) { - rssAverager.Add(rss); - rssAverager.Add(rss2); + IgnoreError(rssAverager.Add(rss)); + IgnoreError(rssAverager.Add(rss2)); ave = rssAverager.GetAverage(); VerifyOrQuit(ave >= MIN_RSS(rss, rss2), "TestLinkQualityInfo failed - GetAverage() is smaller than min value."); @@ -331,7 +331,7 @@ void TestRssAveraging(void) for (j = 1; j <= 8; j++) { rss = GetRandomRss(); - rssAverager.Add(rss); + IgnoreError(rssAverager.Add(rss)); sum += rss; mean = static_cast(sum) / j; VerifyOrQuit(ABS(rssAverager.GetAverage() - mean) < 1, "Average does not match the arithmetic mean!"); diff --git a/tests/unit/test_lowpan.cpp b/tests/unit/test_lowpan.cpp index ef9b23f33..bf10b5bc7 100644 --- a/tests/unit/test_lowpan.cpp +++ b/tests/unit/test_lowpan.cpp @@ -133,7 +133,7 @@ static void Init(void) SuccessOrQuit(message->Append(mockNetworkData, sizeof(mockNetworkData)), "6lo: Message::Append failed"); - sInstance->Get().SetNetworkData(0, 0, true, *message, 0); + IgnoreError(sInstance->Get().SetNetworkData(0, 0, true, *message, 0)); } /** diff --git a/tests/unit/test_lowpan.hpp b/tests/unit/test_lowpan.hpp index d29e32b56..6a1db050f 100644 --- a/tests/unit/test_lowpan.hpp +++ b/tests/unit/test_lowpan.hpp @@ -31,6 +31,7 @@ #include +#include "common/code_utils.hpp" #include "common/instance.hpp" #include "mac/mac.hpp" #include "net/ip6_headers.hpp" @@ -120,8 +121,8 @@ public: mIpHeader.SetPayloadLength(aPayloadLength); mIpHeader.SetNextHeader(aNextHeader); mIpHeader.SetHopLimit(aHopLimit); - mIpHeader.GetSource().FromString(aSource); - mIpHeader.GetDestination().FromString(aDestination); + IgnoreError(mIpHeader.GetSource().FromString(aSource)); + IgnoreError(mIpHeader.GetDestination().FromString(aDestination)); } /** @@ -146,8 +147,8 @@ public: mIpTunneledHeader.SetPayloadLength(aPayloadLength); mIpTunneledHeader.SetNextHeader(aNextHeader); mIpTunneledHeader.SetHopLimit(aHopLimit); - mIpTunneledHeader.GetSource().FromString(aSource); - mIpTunneledHeader.GetDestination().FromString(aDestination); + IgnoreError(mIpTunneledHeader.GetSource().FromString(aSource)); + IgnoreError(mIpTunneledHeader.GetDestination().FromString(aDestination)); } /** diff --git a/tests/unit/test_netif.cpp b/tests/unit/test_netif.cpp index 98dc5d4e5..f1c8debca 100644 --- a/tests/unit/test_netif.cpp +++ b/tests/unit/test_netif.cpp @@ -32,6 +32,7 @@ #include +#include "common/code_utils.hpp" #include "common/debug.hpp" #include "common/instance.hpp" #include "net/netif.hpp" @@ -104,14 +105,14 @@ void TestNetifMulticastAddresses(void) const char *kTestAddress2 = "ff03::114"; const char *kTestAddress3 = "ff04::114"; - addresses[0].FromString(kLinkLocalAllRouters); - addresses[1].FromString(kRealmLocalAllRouters); - addresses[2].FromString(kLinkLocalAllNodes); - addresses[3].FromString(kRealmLocalAllNodes); - addresses[4].FromString(kRealmLocalAllMpl); - addresses[5].FromString(kTestAddress1); - addresses[6].FromString(kTestAddress2); - addresses[7].FromString(kTestAddress3); + IgnoreError(addresses[0].FromString(kLinkLocalAllRouters)); + IgnoreError(addresses[1].FromString(kRealmLocalAllRouters)); + IgnoreError(addresses[2].FromString(kLinkLocalAllNodes)); + IgnoreError(addresses[3].FromString(kRealmLocalAllNodes)); + IgnoreError(addresses[4].FromString(kRealmLocalAllMpl)); + IgnoreError(addresses[5].FromString(kTestAddress1)); + IgnoreError(addresses[6].FromString(kTestAddress2)); + IgnoreError(addresses[7].FromString(kTestAddress3)); VerifyMulticastAddressList(netif, addresses, 0); @@ -134,7 +135,7 @@ void TestNetifMulticastAddresses(void) VerifyOrQuit(netif.UnsubscribeAllRoutersMulticast() == OT_ERROR_NOT_FOUND, "UnsubscribeAllRoutersMulticast() did not fail when not subscribed"); - netifAddress.GetAddress().FromString(kTestAddress1); + IgnoreError(netifAddress.GetAddress().FromString(kTestAddress1)); SuccessOrQuit(netif.SubscribeMulticast(netifAddress), "SubscribeMulticast() failed"); VerifyMulticastAddressList(netif, &addresses[2], 4); @@ -147,7 +148,7 @@ void TestNetifMulticastAddresses(void) VerifyOrQuit(netif.UnsubscribeAllNodesMulticast() == OT_ERROR_NOT_FOUND, "UnsubscribeAllNodesMulticast() did not fail when not subscribed"); - address.FromString(kTestAddress2); + IgnoreError(address.FromString(kTestAddress2)); SuccessOrQuit(netif.SubscribeExternalMulticast(address), "SubscribeExternalMulticast() failed"); VerifyMulticastAddressList(netif, &addresses[5], 2); @@ -163,15 +164,15 @@ void TestNetifMulticastAddresses(void) VerifyOrQuit(netif.SubscribeAllRoutersMulticast() == OT_ERROR_ALREADY, "SubscribeAllRoutersMulticast() did not fail when already subscribed"); - address.FromString(kTestAddress3); + IgnoreError(address.FromString(kTestAddress3)); SuccessOrQuit(netif.SubscribeExternalMulticast(address), "SubscribeExternalMulticast() failed"); VerifyMulticastAddressList(netif, &addresses[0], 8); - address.FromString(kTestAddress1); // same as netifAddress (internal) + IgnoreError(address.FromString(kTestAddress1)); // same as netifAddress (internal) VerifyOrQuit(netif.UnsubscribeExternalMulticast(address) == OT_ERROR_INVALID_ARGS, "UnsubscribeExternalMulticast() did not fail when address was not external"); - address.FromString(kRealmLocalAllMpl); + IgnoreError(address.FromString(kRealmLocalAllMpl)); VerifyOrQuit(netif.UnsubscribeExternalMulticast(address) == OT_ERROR_INVALID_ARGS, "UnsubscribeExternalMulticast() did not fail when address was fixed address"); diff --git a/tests/unit/test_string.cpp b/tests/unit/test_string.cpp index 692819ac2..d7dd50531 100644 --- a/tests/unit/test_string.cpp +++ b/tests/unit/test_string.cpp @@ -83,7 +83,7 @@ void TestString(void) VerifyOrQuit(str1.GetLength() == 0, "GetLength() failed for empty string"); VerifyOrQuit(strcmp(str1.AsCString(), "") == 0, "String content is incorrect"); - str1.Set("%d", 12); + IgnoreError(str1.Set("%d", 12)); VerifyOrQuit(str1.GetLength() == 2, "GetLength() failed"); VerifyOrQuit(strcmp(str1.AsCString(), "12") == 0, "String content is incorrect"); PrintString("str1", str1);