espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-09 10:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[style] replace reinterpret_cast with static_cast where possible (#3718)

Browse Source
This commit is contained in:
Jonathan Hui
2019-03-28 22:29:58 -07:00
committed by GitHub
parent ecad71733d
commit 19544490e3
5 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dataset_manager.cpp
+6 -8
View File
@@ -432,21 +432,19 @@ otError DatasetManager::SendSetRequest(const otOperationalDataset &aDataset, con
if (netif.GetCommissioner().IsActive())
{
const uint8_t *cur = aTlvs;
const uint8_t *end = aTlvs + aLength;
bool hasSessionId = false;
const Tlv *cur = reinterpret_cast<const Tlv *>(aTlvs);
const Tlv *end = reinterpret_cast<const Tlv *>(aTlvs + aLength);
bool hasSessionId = false;
while (cur < end)
for (; cur < end; cur = cur->GetNext())
{
const Tlv *data = reinterpret_cast<const Tlv *>(cur);
VerifyOrExit((cur + 1) <= end, error = OT_ERROR_INVALID_ARGS);
if (data->GetType() == Tlv::kCommissionerSessionId)
if (cur->GetType() == Tlv::kCommissionerSessionId)
{
hasSessionId = true;
break;
}
cur += sizeof(Tlv) + data->GetLength();
}
if (!hasSessionId)
src/core/thread/network_data.cpp
+11 -11
View File
@@ -499,7 +499,7 @@ bool NetworkData::ContainsService(uint8_t aServiceId, uint16_t aRloc16)
if (service->GetServiceID() == aServiceId)
{
subCur = reinterpret_cast<NetworkDataTlv *>(reinterpret_cast<uint8_t *>(service->GetSubTlvs()));
subCur = service->GetSubTlvs();
subEnd = cur->GetNext();
for (; subCur < subEnd; subCur = subCur->GetNext())
@@ -553,7 +553,7 @@ void NetworkData::RemoveTemporaryData(uint8_t *aData, uint8_t &aDataLength)
{
case NetworkDataTlv::kTypePrefix:
{
prefix = reinterpret_cast<PrefixTlv *>(cur);
prefix = static_cast<PrefixTlv *>(cur);
RemoveTemporaryData(aData, aDataLength, *prefix);
if (prefix->GetSubTlvsLength() == 0)
@@ -574,7 +574,7 @@ void NetworkData::RemoveTemporaryData(uint8_t *aData, uint8_t &aDataLength)
case NetworkDataTlv::kTypeService:
{
service = reinterpret_cast<ServiceTlv *>(cur);
service = static_cast<ServiceTlv *>(cur);
RemoveTemporaryData(aData, aDataLength, *service);
if (service->GetSubTlvsLength() == 0)
@@ -733,7 +733,7 @@ void NetworkData::RemoveTemporaryData(uint8_t *aData, uint8_t &aDataLength, Serv
{
case NetworkDataTlv::kTypeServer:
{
server = reinterpret_cast<ServerTlv *>(cur);
server = static_cast<ServerTlv *>(cur);
server->SetServer16(Mle::Mle::GetServiceAlocFromId(aService.GetServiceID()));
break;
}
@@ -773,7 +773,7 @@ BorderRouterTlv *NetworkData::FindBorderRouter(PrefixTlv &aPrefix)
if (cur->GetType() == NetworkDataTlv::kTypeBorderRouter)
{
ExitNow(rval = reinterpret_cast<BorderRouterTlv *>(cur));
ExitNow(rval = static_cast<BorderRouterTlv *>(cur));
}
cur = cur->GetNext();
@@ -795,7 +795,7 @@ BorderRouterTlv *NetworkData::FindBorderRouter(PrefixTlv &aPrefix, bool aStable)
if (cur->GetType() == NetworkDataTlv::kTypeBorderRouter && cur->IsStable() == aStable)
{
ExitNow(rval = reinterpret_cast<BorderRouterTlv *>(cur));
ExitNow(rval = static_cast<BorderRouterTlv *>(cur));
}
cur = cur->GetNext();
@@ -817,7 +817,7 @@ HasRouteTlv *NetworkData::FindHasRoute(PrefixTlv &aPrefix)
if (cur->GetType() == NetworkDataTlv::kTypeHasRoute)
{
ExitNow(rval = reinterpret_cast<HasRouteTlv *>(cur));
ExitNow(rval = static_cast<HasRouteTlv *>(cur));
}
cur = cur->GetNext();
@@ -839,7 +839,7 @@ HasRouteTlv *NetworkData::FindHasRoute(PrefixTlv &aPrefix, bool aStable)
if (cur->GetType() == NetworkDataTlv::kTypeHasRoute && cur->IsStable() == aStable)
{
ExitNow(rval = reinterpret_cast<HasRouteTlv *>(cur));
ExitNow(rval = static_cast<HasRouteTlv *>(cur));
}
cur = cur->GetNext();
@@ -861,7 +861,7 @@ ContextTlv *NetworkData::FindContext(PrefixTlv &aPrefix)
if (cur->GetType() == NetworkDataTlv::kTypeContext)
{
ExitNow(rval = reinterpret_cast<ContextTlv *>(cur));
ExitNow(rval = static_cast<ContextTlv *>(cur));
}
cur = cur->GetNext();
@@ -888,7 +888,7 @@ PrefixTlv *NetworkData::FindPrefix(const uint8_t *aPrefix, uint8_t aPrefixLength
if (cur->GetType() == NetworkDataTlv::kTypePrefix)
{
compare = reinterpret_cast<PrefixTlv *>(cur);
compare = static_cast<PrefixTlv *>(cur);
if (compare->GetPrefixLength() == aPrefixLength &&
PrefixMatch(compare->GetPrefix(), aPrefix, aPrefixLength) >= aPrefixLength)
@@ -959,7 +959,7 @@ ServiceTlv *NetworkData::FindService(uint32_t aEnterpriseNumber,
if (cur->GetType() == NetworkDataTlv::kTypeService)
{
compare = reinterpret_cast<ServiceTlv *>(cur);
compare = static_cast<ServiceTlv *>(cur);
if ((compare->GetEnterpriseNumber() == aEnterpriseNumber) &&
(compare->GetServiceDataLength() == aServiceDataLength) &&
src/core/thread/network_data_leader_ftd.cpp
+4 -4
View File
@@ -691,14 +691,14 @@ bool Leader::IsStableUpdated(uint8_t *aTlvs, uint8_t aTlvsLength, uint8_t *aTlvs
case NetworkDataTlv::kTypeServer:
{
bool foundInBase = false;
ServerTlv *server = reinterpret_cast<ServerTlv *>(curInner);
ServerTlv *server = static_cast<ServerTlv *>(curInner);
NetworkDataTlv *curServerBase = serviceBase->GetSubTlvs();
NetworkDataTlv *endServerBase = serviceBase->GetNext();
while (curServerBase <= endServerBase)
{
ServerTlv *serverBase = reinterpret_cast<ServerTlv *>(curServerBase);
ServerTlv *serverBase = static_cast<ServerTlv *>(curServerBase);
if (curServerBase->IsStable() && (server->GetServer16() == serverBase->GetServer16()) &&
(server->GetServerDataLength() == serverBase->GetServerDataLength()) &&
@@ -1038,7 +1038,7 @@ otError Leader::AddServer(ServiceTlv &aService, ServerTlv &aServer, uint8_t *aOl
dstService->SetLength(serviceInsertLength - sizeof(NetworkDataTlv));
}
dstServer = reinterpret_cast<ServerTlv *>(dstService->GetNext());
dstServer = static_cast<ServerTlv *>(dstService->GetNext());
Insert(reinterpret_cast<uint8_t *>(dstServer), sizeof(ServerTlv) + aServer.GetServerDataLength());
dstServer->Init();
@@ -1069,7 +1069,7 @@ ServiceTlv *Leader::FindServiceById(uint8_t aServiceId)
if (cur->GetType() == NetworkDataTlv::kTypeService)
{
compare = reinterpret_cast<ServiceTlv *>(cur);
compare = static_cast<ServiceTlv *>(cur);
if (compare->GetServiceID() == aServiceId)
{
src/core/thread/network_data_local.cpp
+1 -1
View File
@@ -202,7 +202,7 @@ otError Local::AddService(uint32_t aEnterpriseNumber,
serviceTlv->SetServiceData(aServiceData, aServiceDataLength);
serviceTlv->SetLength(static_cast<uint8_t>(serviceTlvLength));
serverTlv = reinterpret_cast<ServerTlv *>(serviceTlv->GetSubTlvs());
serverTlv = static_cast<ServerTlv *>(serviceTlv->GetSubTlvs());
serverTlv->Init();
// According to Thread spec 1.1.1, section 5.18.6 Service TLV:
src/core/thread/network_diagnostic.cpp
+3 -3
View File
@@ -343,7 +343,7 @@ otError NetworkDiagnostic::FillRequestedTlvs(Message & aRequest,
{
ConnectivityTlv tlv;
tlv.Init();
netif.GetMle().FillConnectivityTlv(*reinterpret_cast<Mle::ConnectivityTlv *>(&tlv));
netif.GetMle().FillConnectivityTlv(reinterpret_cast<Mle::ConnectivityTlv &>(tlv));
SuccessOrExit(error = aResponse.Append(&tlv, sizeof(tlv)));
break;
}
@@ -353,7 +353,7 @@ otError NetworkDiagnostic::FillRequestedTlvs(Message & aRequest,
{
RouteTlv tlv;
tlv.Init();
netif.GetMle().FillRouteTlv(*reinterpret_cast<Mle::RouteTlv *>(&tlv));
netif.GetMle().FillRouteTlv(reinterpret_cast<Mle::RouteTlv &>(tlv));
SuccessOrExit(error = aResponse.Append(&tlv, tlv.GetSize()));
break;
}
@@ -371,7 +371,7 @@ otError NetworkDiagnostic::FillRequestedTlvs(Message & aRequest,
{
NetworkDataTlv tlv;
tlv.Init();
netif.GetMle().FillNetworkDataTlv((*reinterpret_cast<Mle::NetworkDataTlv *>(&tlv)), false);
netif.GetMle().FillNetworkDataTlv((reinterpret_cast<Mle::NetworkDataTlv &>(tlv)), false);
SuccessOrExit(error = aResponse.Append(&tlv, tlv.GetSize()));
break;
}