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

Fix build warnings on Windows (#577)

Browse Source 
* Fix build warnings on Windows
This commit is contained in:
Nick Banks
2016-09-13 09:25:22 -07:00
committed by Jonathan Hui
parent c44c20ef66
commit ae545bb007
13 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli_dataset.cpp
+1 -1
View File
@@ -589,7 +589,7 @@ ThreadError Dataset::ProcessMgmtGetCommand(otInstance *aInstance, int argc, char
else if (strcmp(argv[index], "binary") == 0)
{
VerifyOrExit((index + 1) < argc, error = kThreadError_Parse);
value = (strlen(argv[++index]) + 1) / 2;
value = static_cast<long>(strlen(argv[++index]) + 1) / 2;
VerifyOrExit(static_cast<size_t>(value) <= (sizeof(tlvs) - static_cast<size_t>(length)), error = kThreadError_NoBufs);
VerifyOrExit(Interpreter::Hex2Bin(argv[index], tlvs + length, static_cast<uint16_t>(value)) >= 0,
error = kThreadError_Parse);
src/core/coap/coap_header.cpp
+3 -3
View File
@@ -147,7 +147,7 @@ ThreadError Header::FromMessage(const Message &aMessage)
VerifyOrExit(optionLength <= length, error = kThreadError_Parse);
aMessage.Read(offset, optionLength, mHeader + mHeaderLength);
mHeaderLength += optionLength;
mHeaderLength += static_cast<uint8_t>(optionLength);
offset += optionLength;
length -= optionLength;
}
@@ -200,7 +200,7 @@ ThreadError Header::AppendOption(const Option &aOption)
memcpy(cur, aOption.mValue, aOption.mLength);
cur += aOption.mLength;
mHeaderLength += cur - buf;
mHeaderLength += static_cast<uint8_t>(cur - buf);
mOptionLast = aOption.mNumber;
return kThreadError_None;
@@ -232,7 +232,7 @@ ThreadError Header::AppendUriPathOptions(const char *aUriPath)
ThreadError Header::AppendContentFormatOption(MediaType aType)
{
Option coapOption;
uint8_t type = aType;
uint8_t type = static_cast<uint8_t>(aType);
coapOption.mNumber = Option::kOptionContentFormat;
coapOption.mLength = 1;
src/core/coap/coap_header.hpp
+1 -1
View File
@@ -157,7 +157,7 @@ public:
* @param[in] aCode The Code value.
*
*/
void SetCode(Code aCode) { mCode = aCode; }
void SetCode(Code aCode) { mCode = static_cast<uint8_t>(aCode); }
/**
* This method returns the Message ID value.
src/core/common/message.cpp
+1 -1
View File
@@ -201,7 +201,7 @@ ThreadError Message::MoveOffset(int aDelta)
assert(GetOffset() + aDelta <= GetLength());
VerifyOrExit(GetOffset() + aDelta <= GetLength(), error = kThreadError_InvalidArgs);
mInfo.mOffset += aDelta;
mInfo.mOffset += static_cast<uint16_t>(aDelta);
assert(mInfo.mOffset <= GetLength());
exit:
src/core/meshcop/dtls.cpp
+5 -13
View File
@@ -178,7 +178,7 @@ int Dtls::HandleMbedtlsTransmit(void *aContext, const unsigned char *aBuf, size_
int Dtls::HandleMbedtlsTransmit(const unsigned char *aBuf, size_t aLength)
{
ThreadError error;
int rval;
int rval = 0;
otLogInfoMeshCoP("Dtls::HandleMbedtlsTransmit\r\n");
@@ -221,8 +221,8 @@ int Dtls::HandleMbedtlsReceive(unsigned char *aBuf, size_t aLength)
}
rval = (int)mReceiveMessage->Read(mReceiveOffset, (uint16_t)aLength, aBuf);
mReceiveOffset += rval;
mReceiveLength -= rval;
mReceiveOffset += static_cast<uint16_t>(rval);
mReceiveLength -= static_cast<uint16_t>(rval);
exit:
return rval;
@@ -351,7 +351,7 @@ void Dtls::Process(void)
ThreadError Dtls::MapError(int rval)
{
ThreadError error;
ThreadError error = kThreadError_None;
switch (rval)
{
@@ -364,15 +364,7 @@ ThreadError Dtls::MapError(int rval)
break;
default:
if (rval >= 0)
{
error = kThreadError_None;
}
else
{
assert(false);
}
assert(rval >= 0);
break;
}
src/core/net/ip6.cpp
+3 -3
View File
@@ -100,7 +100,7 @@ uint16_t Ip6::ComputePseudoheaderChecksum(const Address &src, const Address &dst
uint16_t checksum;
checksum = Ip6::UpdateChecksum(0, length);
checksum = Ip6::UpdateChecksum(checksum, proto);
checksum = Ip6::UpdateChecksum(checksum, static_cast<uint16_t>(proto));
checksum = UpdateChecksum(checksum, src);
checksum = UpdateChecksum(checksum, dst);
@@ -323,7 +323,7 @@ ThreadError Ip6::HandleExtensionHeaders(Message &message, uint8_t &nextHeader, b
ExitNow();
}
nextHeader = extensionHeader.GetNextHeader();
nextHeader = static_cast<uint8_t>(extensionHeader.GetNextHeader());
}
exit:
@@ -485,7 +485,7 @@ ThreadError Ip6::HandleDatagram(Message &message, Netif *netif, int8_t interface
message.SetOffset(sizeof(header));
// process IPv6 Extension Headers
nextHeader = header.GetNextHeader();
nextHeader = static_cast<uint8_t>(header.GetNextHeader());
SuccessOrExit(error = HandleExtensionHeaders(message, nextHeader, receive));
// process IPv6 Payload
src/core/net/ip6_mpl.hpp
+1 -1
View File
@@ -99,7 +99,7 @@ public:
* @param[in] aSeedLength The MPL Seed Length.
*
*/
void SetSeedLength(SeedLength aSeedLength) { mControl = (mControl & ~kSeedLengthMask) | aSeedLength; }
void SetSeedLength(SeedLength aSeedLength) { mControl = static_cast<uint8_t>((mControl & ~kSeedLengthMask) | aSeedLength); }
/**
* This method indicates whether or not the MPL M flag is set.
src/core/thread/lowpan.cpp
+4 -4
View File
@@ -288,7 +288,7 @@ int Lowpan::Compress(Message &aMessage, const Mac::Address &aMacSource, const Ma
break;
default:
cur[0] = ip6Header.GetNextHeader();
cur[0] = static_cast<uint8_t>(ip6Header.GetNextHeader());
cur++;
break;
}
@@ -358,7 +358,7 @@ int Lowpan::Compress(Message &aMessage, const Mac::Address &aMacSource, const Ma
aBuf[1] = hcCtl & 0xff;
aMessage.SetOffset(sizeof(ip6Header));
nextHeader = ip6Header.GetNextHeader();
nextHeader = static_cast<uint8_t>(ip6Header.GetNextHeader());
while (1)
{
@@ -391,7 +391,7 @@ int Lowpan::CompressExtensionHeader(Message &aMessage, uint8_t *aBuf, uint8_t &a
aMessage.MoveOffset(sizeof(extHeader));
cur[0] = kExtHdrDispatch | kExtHdrEidHbh;
aNextHeader = extHeader.GetNextHeader();
aNextHeader = static_cast<uint8_t>(extHeader.GetNextHeader());
switch (extHeader.GetNextHeader())
{
@@ -401,7 +401,7 @@ int Lowpan::CompressExtensionHeader(Message &aMessage, uint8_t *aBuf, uint8_t &a
default:
cur++;
cur[0] = extHeader.GetNextHeader();
cur[0] = static_cast<uint8_t>(extHeader.GetNextHeader());
break;
}
src/core/thread/mesh_forwarder.cpp
+4 -4
View File
@@ -850,7 +850,7 @@ ThreadError MeshForwarder::SendFragment(Message &aMessage, Mac::Frame &aFrame)
if (aMessage.IsLinkSecurityEnabled())
{
fcf |= Mac::Frame::kFcfSecurityEnabled;
secCtl = aMessage.IsJoinerEntrust() ? Mac::Frame::kKeyIdMode0 : Mac::Frame::kKeyIdMode1;
secCtl = static_cast<uint8_t>(aMessage.IsJoinerEntrust() ? Mac::Frame::kKeyIdMode0 : Mac::Frame::kKeyIdMode1);
secCtl |= Mac::Frame::kSecEncMic32;
}
@@ -911,7 +911,7 @@ ThreadError MeshForwarder::SendFragment(Message &aMessage, Mac::Frame &aFrame)
{
hcLength = mLowpan.Compress(aMessage, meshSource, meshDest, payload);
assert(hcLength > 0);
headerLength += hcLength;
headerLength += static_cast<uint8_t>(hcLength);
payloadLength = aMessage.GetLength() - aMessage.GetOffset();
@@ -1309,7 +1309,7 @@ void MeshForwarder::HandleFragment(uint8_t *aFrame, uint8_t aFrameLength,
VerifyOrExit(headerLength > 0, error = kThreadError_NoBufs);
aFrame += headerLength;
aFrameLength -= headerLength;
aFrameLength -= static_cast<uint8_t>(headerLength);
VerifyOrExit(message->SetLength(datagramLength) == kThreadError_None, error = kThreadError_NoBufs);
datagramLength = HostSwap16(datagramLength - sizeof(Ip6::Header));
@@ -1422,7 +1422,7 @@ void MeshForwarder::HandleLowpanHC(uint8_t *aFrame, uint8_t aFrameLength,
VerifyOrExit(headerLength > 0, error = kThreadError_Drop);
aFrame += headerLength;
aFrameLength -= headerLength;
aFrameLength -= static_cast<uint8_t>(headerLength);
SuccessOrExit(error = message->SetLength(message->GetLength() + aFrameLength));
src/core/thread/meshcop_dataset_manager.cpp
+2 -1
View File
@@ -245,7 +245,8 @@ void DatasetManager::HandleSet(Coap::Header &aHeader, Message &aMessage, const I
VerifyOrExit(mMle.GetDeviceState() == Mle::kDeviceStateLeader, state = StateTlv::kReject);
type = strcmp(mUriSet, OPENTHREAD_URI_ACTIVE_SET) == 0 ? Tlv::kActiveTimestamp : Tlv::kPendingTimestamp;
type = static_cast<uint8_t>(strcmp(mUriSet,
OPENTHREAD_URI_ACTIVE_SET) == 0 ? Tlv::kActiveTimestamp : Tlv::kPendingTimestamp);
while (offset < aMessage.GetLength())
{
src/ncp/spinel.c
+4 -4
View File
@@ -393,9 +393,9 @@ spinel_datatype_vunpack_(const uint8_t *data_ptr, spinel_size_t data_len, const
*arg_ptr = (const char *)data_ptr;
}
ret += len;
ret += (spinel_size_t)len;
data_ptr += len;
data_len -= len;
data_len -= (spinel_size_t)len;
break;
}
@@ -719,14 +719,14 @@ spinel_datatype_vpack_(uint8_t *data_ptr, spinel_size_t data_len_max, const char
string_arg_len = 1;
}
ret += string_arg_len;
ret += (spinel_size_t)string_arg_len;
if (data_len_max >= string_arg_len)
{
memcpy(data_ptr, string_arg, string_arg_len);
data_ptr += string_arg_len;
data_len_max -= string_arg_len;
data_len_max -= (spinel_size_t)string_arg_len;
}
else
{
tests/unit/test_vector.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "test_vector.h"
const test_lowpan_vector_t sTestVectorLowpan[] =
test_lowpan_vector_t sTestVectorLowpan[] =
{
{
// I1_t1_AF_pass.pcap
tests/unit/test_vector.h
+1 -1
View File
@@ -64,7 +64,7 @@ typedef const struct
} test_lowpan_vector_t;
extern const test_lowpan_vector_t sTestVectorLowpan[];
extern test_lowpan_vector_t sTestVectorLowpan[];
extern const unsigned sTestVectorLowpanLen;
#ifdef __cplusplus