diff --git a/include/openthread/coap.h b/include/openthread/coap.h index dc2a031ac..f7733d946 100644 --- a/include/openthread/coap.h +++ b/include/openthread/coap.h @@ -850,11 +850,8 @@ otError otCoapStop(otInstance *aInstance); * @param[in] aInstance A pointer to an OpenThread instance. * @param[in] aResource A pointer to the resource. * - * @retval OT_ERROR_NONE Successfully added @p aResource. - * @retval OT_ERROR_ALREADY The @p aResource was already added. - * */ -otError otCoapAddResource(otInstance *aInstance, otCoapResource *aResource); +void otCoapAddResource(otInstance *aInstance, otCoapResource *aResource); /** * This function removes a resource from the CoAP server. diff --git a/include/openthread/coap_secure.h b/include/openthread/coap_secure.h index e939fe58f..11caec54d 100644 --- a/include/openthread/coap_secure.h +++ b/include/openthread/coap_secure.h @@ -257,11 +257,8 @@ otError otCoapSecureSendRequest(otInstance * aInstance, * @param[in] aInstance A pointer to an OpenThread instance. * @param[in] aResource A pointer to the resource. * - * @retval OT_ERROR_NONE Successfully added @p aResource. - * @retval OT_ERROR_ALREADY The @p aResource was already added. - * */ -otError otCoapSecureAddResource(otInstance *aInstance, otCoapResource *aResource); +void otCoapSecureAddResource(otInstance *aInstance, otCoapResource *aResource); /** * This function removes a resource from the CoAP Secure server. diff --git a/src/cli/cli_coap.cpp b/src/cli/cli_coap.cpp index 628ce217c..8812eef8d 100644 --- a/src/cli/cli_coap.cpp +++ b/src/cli/cli_coap.cpp @@ -193,7 +193,7 @@ otError Coap::ProcessResource(uint8_t aArgsLength, char *aArgs[]) mResource.mHandler = &Coap::HandleRequest; strncpy(mUriPath, aArgs[1], sizeof(mUriPath) - 1); - SuccessOrExit(error = otCoapAddResource(mInterpreter.mInstance, &mResource)); + otCoapAddResource(mInterpreter.mInstance, &mResource); } else { diff --git a/src/cli/cli_coap_secure.cpp b/src/cli/cli_coap_secure.cpp index fa7c3e648..4a5fcc623 100644 --- a/src/cli/cli_coap_secure.cpp +++ b/src/cli/cli_coap_secure.cpp @@ -124,7 +124,7 @@ otError CoapSecure::ProcessResource(uint8_t aArgsLength, char *aArgs[]) mResource.mHandler = &CoapSecure::HandleRequest; strncpy(mUriPath, aArgs[1], sizeof(mUriPath) - 1); - SuccessOrExit(error = otCoapSecureAddResource(mInterpreter.mInstance, &mResource)); + otCoapSecureAddResource(mInterpreter.mInstance, &mResource); } else { @@ -132,7 +132,7 @@ otError CoapSecure::ProcessResource(uint8_t aArgsLength, char *aArgs[]) } exit: - return OT_ERROR_NONE; + return error; } otError CoapSecure::ProcessStart(uint8_t aArgsLength, char *aArgs[]) diff --git a/src/core/api/coap_api.cpp b/src/core/api/coap_api.cpp index dc963596b..d4dcf86a7 100644 --- a/src/core/api/coap_api.cpp +++ b/src/core/api/coap_api.cpp @@ -249,11 +249,11 @@ otError otCoapStop(otInstance *aInstance) return instance.GetApplicationCoap().Stop(); } -otError otCoapAddResource(otInstance *aInstance, otCoapResource *aResource) +void otCoapAddResource(otInstance *aInstance, otCoapResource *aResource) { Instance &instance = *static_cast(aInstance); - return instance.GetApplicationCoap().AddResource(*static_cast(aResource)); + instance.GetApplicationCoap().AddResource(*static_cast(aResource)); } void otCoapRemoveResource(otInstance *aInstance, otCoapResource *aResource) diff --git a/src/core/api/coap_secure_api.cpp b/src/core/api/coap_secure_api.cpp index 6fb973d4d..7139fa728 100644 --- a/src/core/api/coap_secure_api.cpp +++ b/src/core/api/coap_secure_api.cpp @@ -161,11 +161,11 @@ otError otCoapSecureSendRequest(otInstance * aInstance, return instance.GetApplicationCoapSecure().SendMessage(*static_cast(aMessage), aHandler, aContext); } -otError otCoapSecureAddResource(otInstance *aInstance, otCoapResource *aResource) +void otCoapSecureAddResource(otInstance *aInstance, otCoapResource *aResource) { Instance &instance = *static_cast(aInstance); - return instance.GetApplicationCoapSecure().AddResource(*static_cast(aResource)); + instance.GetApplicationCoapSecure().AddResource(*static_cast(aResource)); } void otCoapSecureRemoveResource(otInstance *aInstance, otCoapResource *aResource) diff --git a/src/core/coap/coap.cpp b/src/core/coap/coap.cpp index 530b4ad72..0c4c394bf 100644 --- a/src/core/coap/coap.cpp +++ b/src/core/coap/coap.cpp @@ -90,9 +90,9 @@ void CoapBase::ClearRequests(const Ip6::Address *aAddress) } } -otError CoapBase::AddResource(Resource &aResource) +void CoapBase::AddResource(Resource &aResource) { - return mResources.Add(aResource); + IgnoreError(mResources.Add(aResource)); } void CoapBase::RemoveResource(Resource &aResource) diff --git a/src/core/coap/coap.hpp b/src/core/coap/coap.hpp index 10bdf27fa..f314f797e 100644 --- a/src/core/coap/coap.hpp +++ b/src/core/coap/coap.hpp @@ -307,11 +307,8 @@ public: * * @param[in] aResource A reference to the resource. * - * @retval OT_ERROR_NONE Successfully added @p aResource. - * @retval OT_ERROR_ALREADY The @p aResource was already added. - * */ - otError AddResource(Resource &aResource); + void AddResource(Resource &aResource); /** * This method removes a resource from the CoAP server. diff --git a/src/core/meshcop/border_agent.cpp b/src/core/meshcop/border_agent.cpp index a92e2190d..ca3be6b70 100644 --- a/src/core/meshcop/border_agent.cpp +++ b/src/core/meshcop/border_agent.cpp @@ -676,18 +676,18 @@ otError BorderAgent::Start(void) SuccessOrExit(error = coaps.SetPsk(Get().GetPskc().m8, OT_PSKC_MAX_SIZE)); coaps.SetConnectedCallback(HandleConnected, this); - IgnoreError(coaps.AddResource(mActiveGet)); - IgnoreError(coaps.AddResource(mActiveSet)); - IgnoreError(coaps.AddResource(mPendingGet)); - IgnoreError(coaps.AddResource(mPendingSet)); - IgnoreError(coaps.AddResource(mCommissionerPetition)); - IgnoreError(coaps.AddResource(mCommissionerKeepAlive)); - IgnoreError(coaps.AddResource(mCommissionerSet)); - IgnoreError(coaps.AddResource(mCommissionerGet)); - IgnoreError(coaps.AddResource(mProxyTransmit)); - IgnoreError(coaps.AddResource(mRelayTransmit)); + coaps.AddResource(mActiveGet); + coaps.AddResource(mActiveSet); + coaps.AddResource(mPendingGet); + coaps.AddResource(mPendingSet); + coaps.AddResource(mCommissionerPetition); + coaps.AddResource(mCommissionerKeepAlive); + coaps.AddResource(mCommissionerSet); + coaps.AddResource(mCommissionerGet); + coaps.AddResource(mProxyTransmit); + coaps.AddResource(mRelayTransmit); - IgnoreError(Get().AddResource(mRelayReceive)); + Get().AddResource(mRelayReceive); SetState(OT_BORDER_AGENT_STATE_STARTED); diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp index 38f265174..b14c50437 100644 --- a/src/core/meshcop/commissioner.cpp +++ b/src/core/meshcop/commissioner.cpp @@ -114,9 +114,9 @@ void Commissioner::SignalJoinerEvent(otCommissionerJoinerEvent aEvent, const Mac void Commissioner::AddCoapResources(void) { - IgnoreError(Get().AddResource(mRelayReceive)); - IgnoreError(Get().AddResource(mDatasetChanged)); - IgnoreError(Get().AddResource(mJoinerFinalize)); + Get().AddResource(mRelayReceive); + Get().AddResource(mDatasetChanged); + Get().AddResource(mJoinerFinalize); } void Commissioner::RemoveCoapResources(void) diff --git a/src/core/meshcop/dataset_manager.cpp b/src/core/meshcop/dataset_manager.cpp index 110038f5e..2efaa2a14 100644 --- a/src/core/meshcop/dataset_manager.cpp +++ b/src/core/meshcop/dataset_manager.cpp @@ -683,7 +683,7 @@ ActiveDataset::ActiveDataset(Instance &aInstance) , mResourceSet(OT_URI_PATH_ACTIVE_SET, &ActiveDataset::HandleSet, this) #endif { - IgnoreError(Get().AddResource(mResourceGet)); + Get().AddResource(mResourceGet); } bool ActiveDataset::IsPartiallyComplete(void) const @@ -732,7 +732,7 @@ PendingDataset::PendingDataset(Instance &aInstance) , mResourceSet(OT_URI_PATH_PENDING_SET, &PendingDataset::HandleSet, this) #endif { - IgnoreError(Get().AddResource(mResourceGet)); + Get().AddResource(mResourceGet); } void PendingDataset::Clear(void) diff --git a/src/core/meshcop/dataset_manager_ftd.cpp b/src/core/meshcop/dataset_manager_ftd.cpp index 25da998d1..5ad882412 100644 --- a/src/core/meshcop/dataset_manager_ftd.cpp +++ b/src/core/meshcop/dataset_manager_ftd.cpp @@ -461,7 +461,7 @@ exit: void ActiveDataset::StartLeader(void) { IgnoreError(GenerateLocal()); - IgnoreError(Get().AddResource(mResourceSet)); + Get().AddResource(mResourceSet); } void ActiveDataset::StopLeader(void) @@ -487,7 +487,7 @@ exit: void PendingDataset::StartLeader(void) { StartDelayTimer(); - IgnoreError(Get().AddResource(mResourceSet)); + Get().AddResource(mResourceSet); } void PendingDataset::StopLeader(void) diff --git a/src/core/meshcop/energy_scan_client.cpp b/src/core/meshcop/energy_scan_client.cpp index 0cee3e573..4f4f7d234 100644 --- a/src/core/meshcop/energy_scan_client.cpp +++ b/src/core/meshcop/energy_scan_client.cpp @@ -51,11 +51,11 @@ namespace ot { EnergyScanClient::EnergyScanClient(Instance &aInstance) : InstanceLocator(aInstance) + , mCallback(NULL) + , mContext(NULL) , mEnergyScan(OT_URI_PATH_ENERGY_REPORT, &EnergyScanClient::HandleReport, this) { - mContext = NULL; - mCallback = NULL; - IgnoreError(Get().AddResource(mEnergyScan)); + Get().AddResource(mEnergyScan); } otError EnergyScanClient::SendQuery(uint32_t aChannelMask, diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp index c3d223cd3..36345f07c 100644 --- a/src/core/meshcop/joiner.cpp +++ b/src/core/meshcop/joiner.cpp @@ -65,7 +65,7 @@ Joiner::Joiner(Instance &aInstance) , mJoinerEntrust(OT_URI_PATH_JOINER_ENTRUST, &Joiner::HandleJoinerEntrust, this) { memset(mJoinerRouters, 0, sizeof(mJoinerRouters)); - IgnoreError(Get().AddResource(mJoinerEntrust)); + Get().AddResource(mJoinerEntrust); } void Joiner::GetJoinerId(Mac::ExtAddress &aJoinerId) const diff --git a/src/core/meshcop/joiner_router.cpp b/src/core/meshcop/joiner_router.cpp index 5d0e4587e..227415457 100644 --- a/src/core/meshcop/joiner_router.cpp +++ b/src/core/meshcop/joiner_router.cpp @@ -63,7 +63,7 @@ JoinerRouter::JoinerRouter(Instance &aInstance) , mIsJoinerPortConfigured(false) , mExpectJoinEntRsp(false) { - IgnoreError(Get().AddResource(mRelayTransmit)); + Get().AddResource(mRelayTransmit); } void JoinerRouter::HandleStateChanged(Notifier::Callback &aCallback, otChangedFlags aFlags) diff --git a/src/core/meshcop/meshcop_leader.cpp b/src/core/meshcop/meshcop_leader.cpp index 629acc392..9bd9a6d82 100644 --- a/src/core/meshcop/meshcop_leader.cpp +++ b/src/core/meshcop/meshcop_leader.cpp @@ -60,8 +60,8 @@ Leader::Leader(Instance &aInstance) , mDelayTimerMinimal(DelayTimerTlv::kDelayTimerMinimal) , mSessionId(Random::NonCrypto::GetUint16()) { - IgnoreError(Get().AddResource(mPetition)); - IgnoreError(Get().AddResource(mKeepAlive)); + Get().AddResource(mPetition); + Get().AddResource(mKeepAlive); } void Leader::HandlePetition(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo) diff --git a/src/core/meshcop/panid_query_client.cpp b/src/core/meshcop/panid_query_client.cpp index 7eb0526d5..1fa2dea4a 100644 --- a/src/core/meshcop/panid_query_client.cpp +++ b/src/core/meshcop/panid_query_client.cpp @@ -54,7 +54,7 @@ PanIdQueryClient::PanIdQueryClient(Instance &aInstance) , mContext(NULL) , mPanIdQuery(OT_URI_PATH_PANID_CONFLICT, &PanIdQueryClient::HandleConflict, this) { - IgnoreError(Get().AddResource(mPanIdQuery)); + Get().AddResource(mPanIdQuery); } otError PanIdQueryClient::SendQuery(uint16_t aPanId, diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp index 6547526d5..113e281cc 100644 --- a/src/core/thread/address_resolver.cpp +++ b/src/core/thread/address_resolver.cpp @@ -71,9 +71,9 @@ AddressResolver::AddressResolver(Instance &aInstance) mUnusedList.Push(*entry); } - IgnoreError(Get().AddResource(mAddressError)); - IgnoreError(Get().AddResource(mAddressQuery)); - IgnoreError(Get().AddResource(mAddressNotification)); + Get().AddResource(mAddressError); + Get().AddResource(mAddressQuery); + Get().AddResource(mAddressNotification); IgnoreError(Get().RegisterHandler(mIcmpHandler)); } diff --git a/src/core/thread/announce_begin_server.cpp b/src/core/thread/announce_begin_server.cpp index fa808d35f..c37d567e3 100644 --- a/src/core/thread/announce_begin_server.cpp +++ b/src/core/thread/announce_begin_server.cpp @@ -51,7 +51,7 @@ AnnounceBeginServer::AnnounceBeginServer(Instance &aInstance) : AnnounceSenderBase(aInstance, &AnnounceBeginServer::HandleTimer) , mAnnounceBegin(OT_URI_PATH_ANNOUNCE_BEGIN, &AnnounceBeginServer::HandleRequest, this) { - IgnoreError(Get().AddResource(mAnnounceBegin)); + Get().AddResource(mAnnounceBegin); } void AnnounceBeginServer::SendAnnounce(uint32_t aChannelMask, uint8_t aCount, uint16_t aPeriod) diff --git a/src/core/thread/energy_scan_server.cpp b/src/core/thread/energy_scan_server.cpp index 0ef750036..67e309c3b 100644 --- a/src/core/thread/energy_scan_server.cpp +++ b/src/core/thread/energy_scan_server.cpp @@ -59,7 +59,7 @@ EnergyScanServer::EnergyScanServer(Instance &aInstance) , mNotifierCallback(aInstance, &EnergyScanServer::HandleStateChanged, this) , mEnergyScan(OT_URI_PATH_ENERGY_SCAN, &EnergyScanServer::HandleRequest, this) { - IgnoreError(Get().AddResource(mEnergyScan)); + Get().AddResource(mEnergyScan); } void EnergyScanServer::HandleRequest(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo) diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 3380d70af..90b4f7ca3 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -356,8 +356,8 @@ void MleRouter::SetStateLeader(uint16_t aRloc16) Get().Start(); Get().StartLeader(); Get().StartLeader(); - IgnoreError(Get().AddResource(mAddressSolicit)); - IgnoreError(Get().AddResource(mAddressRelease)); + Get().AddResource(mAddressSolicit); + Get().AddResource(mAddressRelease); Get().SetForwardingEnabled(true); Get().SetTimerExpirations(kMplRouterDataMessageTimerExpirations); Get().SetBeaconEnabled(true); diff --git a/src/core/thread/network_data_leader_ftd.cpp b/src/core/thread/network_data_leader_ftd.cpp index fb690bc76..6a3876aed 100644 --- a/src/core/thread/network_data_leader_ftd.cpp +++ b/src/core/thread/network_data_leader_ftd.cpp @@ -76,9 +76,9 @@ void Leader::Reset(void) void Leader::Start(void) { - IgnoreError(Get().AddResource(mServerData)); - IgnoreError(Get().AddResource(mCommissioningDataGet)); - IgnoreError(Get().AddResource(mCommissioningDataSet)); + Get().AddResource(mServerData); + Get().AddResource(mCommissioningDataGet); + Get().AddResource(mCommissioningDataSet); } void Leader::Stop(void) diff --git a/src/core/thread/network_diagnostic.cpp b/src/core/thread/network_diagnostic.cpp index 29998e417..1f3933408 100644 --- a/src/core/thread/network_diagnostic.cpp +++ b/src/core/thread/network_diagnostic.cpp @@ -63,10 +63,10 @@ NetworkDiagnostic::NetworkDiagnostic(Instance &aInstance) , mReceiveDiagnosticGetCallback(NULL) , mReceiveDiagnosticGetCallbackContext(NULL) { - IgnoreError(Get().AddResource(mDiagnosticGetRequest)); - IgnoreError(Get().AddResource(mDiagnosticGetQuery)); - IgnoreError(Get().AddResource(mDiagnosticGetAnswer)); - IgnoreError(Get().AddResource(mDiagnosticReset)); + Get().AddResource(mDiagnosticGetRequest); + Get().AddResource(mDiagnosticGetQuery); + Get().AddResource(mDiagnosticGetAnswer); + Get().AddResource(mDiagnosticReset); } void NetworkDiagnostic::SetReceiveDiagnosticGetCallback(otReceiveDiagnosticGetCallback aCallback, diff --git a/src/core/thread/panid_query_server.cpp b/src/core/thread/panid_query_server.cpp index 8e54923b9..55062e9b8 100644 --- a/src/core/thread/panid_query_server.cpp +++ b/src/core/thread/panid_query_server.cpp @@ -53,7 +53,7 @@ PanIdQueryServer::PanIdQueryServer(Instance &aInstance) , mTimer(aInstance, &PanIdQueryServer::HandleTimer, this) , mPanIdQuery(OT_URI_PATH_PANID_QUERY, &PanIdQueryServer::HandleQuery, this) { - IgnoreError(Get().AddResource(mPanIdQuery)); + Get().AddResource(mPanIdQuery); } void PanIdQueryServer::HandleQuery(void *aContext, otMessage *aMessage, const otMessageInfo *aMessageInfo)