diff --git a/include/openthread-diag.h b/include/openthread-diag.h index bc5834a52..7ffdb329a 100644 --- a/include/openthread-diag.h +++ b/include/openthread-diag.h @@ -47,7 +47,7 @@ char *diagProcessCmd(int argc, char *argv[]); char *diagProcessCmdLine(char *string); -bool isDiagEnabled(); +bool isDiagEnabled(void); #ifdef __cplusplus } // extern "C" diff --git a/include/openthread.h b/include/openthread.h index ed0ed46cc..4b684f650 100644 --- a/include/openthread.h +++ b/include/openthread.h @@ -128,7 +128,7 @@ OTAPI const char *OTCALL otGetVersionString(void); * @sa otApiFinalize * */ -OTAPI otApiInstance *OTCALL otApiInit(); +OTAPI otApiInstance *OTCALL otApiInit(void); /** * This function uninitializes the OpenThread library. diff --git a/src/core/coap/coap_client.cpp b/src/core/coap/coap_client.cpp index c871f5814..468706902 100644 --- a/src/core/coap/coap_client.cpp +++ b/src/core/coap/coap_client.cpp @@ -50,7 +50,7 @@ Client::Client(Ip6::Netif &aNetif, SenderFunction aSender, ReceiverFunction aRec mMessageId = static_cast(otPlatRandomGet()); } -ThreadError Client::Start() +ThreadError Client::Start(void) { Ip6::SockAddr addr; addr.mPort = static_cast(mSocket.mTransport)->GetEphemeralPort(); @@ -58,7 +58,7 @@ ThreadError Client::Start() return CoapBase::Start(addr); } -ThreadError Client::Stop() +ThreadError Client::Stop(void) { Message *message = mPendingRequests.GetHead(); Message *messageToRemove; diff --git a/src/core/coap/coap_server.cpp b/src/core/coap/coap_server.cpp index 820f5f65f..d6a52e570 100644 --- a/src/core/coap/coap_server.cpp +++ b/src/core/coap/coap_server.cpp @@ -44,7 +44,7 @@ Server::Server(Ip6::Udp &aUdp, uint16_t aPort, SenderFunction aSender, ReceiverF mResources = NULL; } -ThreadError Server::Start() +ThreadError Server::Start(void) { Ip6::SockAddr sockaddr; sockaddr.mPort = mPort; @@ -52,7 +52,7 @@ ThreadError Server::Start() return CoapBase::Start(sockaddr); } -ThreadError Server::Stop() +ThreadError Server::Stop(void) { return CoapBase::Stop(); } diff --git a/src/core/coap/coap_server.hpp b/src/core/coap/coap_server.hpp index b2ce33bac..d372e75b6 100644 --- a/src/core/coap/coap_server.hpp +++ b/src/core/coap/coap_server.hpp @@ -117,7 +117,7 @@ public: * @retval kThreadError_None Successfully started the CoAP server. * */ - ThreadError Start(); + ThreadError Start(void); /** * This method stops the CoAP server. @@ -125,7 +125,7 @@ public: * @retval kThreadError_None Successfully stopped the CoAP server. * */ - ThreadError Stop(); + ThreadError Stop(void); /** * This method adds a resource to the CoAP server. diff --git a/src/core/mac/mac.hpp b/src/core/mac/mac.hpp index 080e0e75e..8182d01e4 100644 --- a/src/core/mac/mac.hpp +++ b/src/core/mac/mac.hpp @@ -557,7 +557,7 @@ public: * This function emptys the source match table. * */ - void ClearSrcMatchEntries(); + void ClearSrcMatchEntries(void); /** * This function indicates whether or not transmit retries and CSMA backoff logic is supported by the radio layer. diff --git a/src/core/meshcop/tlvs.hpp b/src/core/meshcop/tlvs.hpp index 0b58119d1..a45b54db4 100644 --- a/src/core/meshcop/tlvs.hpp +++ b/src/core/meshcop/tlvs.hpp @@ -138,7 +138,7 @@ public: * @returns A pointer to the value. * */ - uint8_t *GetValue() { return reinterpret_cast(this) + sizeof(Tlv); } + uint8_t *GetValue(void) { return reinterpret_cast(this) + sizeof(Tlv); } /** * This method returns a pointer to the Value. @@ -146,7 +146,7 @@ public: * @returns A pointer to the value. * */ - const uint8_t *GetValue() const { return reinterpret_cast(this) + sizeof(Tlv); } + const uint8_t *GetValue(void) const { return reinterpret_cast(this) + sizeof(Tlv); } /** * This method returns a pointer to the next TLV. @@ -154,11 +154,11 @@ public: * @returns A pointer to the next TLV. * */ - Tlv *GetNext() { + Tlv *GetNext(void) { return reinterpret_cast(reinterpret_cast(this) + sizeof(*this) + mLength); } - const Tlv *GetNext() const { + const Tlv *GetNext(void) const { return reinterpret_cast(reinterpret_cast(this) + sizeof(*this) + mLength); } @@ -203,7 +203,7 @@ public: * This method returns the Length value. * */ - uint16_t GetLength() const { return HostSwap16(mLength); } + uint16_t GetLength(void) const { return HostSwap16(mLength); } /** * This method sets the Length value. @@ -1063,7 +1063,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kJoinerIid); SetLength(sizeof(*this) - sizeof(Tlv)); } + void Init(void) { SetType(kJoinerIid); SetLength(sizeof(*this) - sizeof(Tlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -1072,7 +1072,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(Tlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(Tlv); } /** * This method returns a pointer to the Joiner IID. @@ -1080,7 +1080,7 @@ public: * @returns A pointer to the Joiner IID. * */ - const uint8_t *GetIid() const { return mIid; } + const uint8_t *GetIid(void) const { return mIid; } /** * This method sets the Joiner IID. @@ -1149,7 +1149,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kJoinerRouterKek); SetLength(sizeof(*this) - sizeof(Tlv)); } + void Init(void) { SetType(kJoinerRouterKek); SetLength(sizeof(*this) - sizeof(Tlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -1158,7 +1158,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(Tlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(Tlv); } /** * This method returns a pointer to the Joiner Router KEK. @@ -1166,7 +1166,7 @@ public: * @returns A pointer to the Joiner Router KEK. * */ - const uint8_t *GetKek() const { return mKek; } + const uint8_t *GetKek(void) const { return mKek; } /** * This method sets the Joiner Router KEK. diff --git a/src/core/net/dhcp6_client.cpp b/src/core/net/dhcp6_client.cpp index 1d43181eb..9e8e5e162 100644 --- a/src/core/net/dhcp6_client.cpp +++ b/src/core/net/dhcp6_client.cpp @@ -257,7 +257,7 @@ exit: {} } -ThreadError Dhcp6Client::Start() +ThreadError Dhcp6Client::Start(void) { Ip6::SockAddr sockaddr; @@ -270,7 +270,7 @@ ThreadError Dhcp6Client::Start() return kThreadError_None; } -ThreadError Dhcp6Client::Stop() +ThreadError Dhcp6Client::Stop(void) { mSocket.Close(); return kThreadError_None; diff --git a/src/core/net/dhcp6_server.cpp b/src/core/net/dhcp6_server.cpp index 9e7579e24..5d03b7bf9 100644 --- a/src/core/net/dhcp6_server.cpp +++ b/src/core/net/dhcp6_server.cpp @@ -64,7 +64,7 @@ Dhcp6Server::Dhcp6Server(ThreadNetif &aThreadNetif): mPrefixAgentsMask = 0; } -ThreadError Dhcp6Server::UpdateService() +ThreadError Dhcp6Server::UpdateService(void) { ThreadError error = kThreadError_None; bool found; @@ -185,7 +185,7 @@ exit: return error; } -ThreadError Dhcp6Server::Start() +ThreadError Dhcp6Server::Start(void) { Ip6::SockAddr sockaddr; sockaddr.mPort = kDhcpServerPort; @@ -195,7 +195,7 @@ ThreadError Dhcp6Server::Start() return kThreadError_None; } -ThreadError Dhcp6Server::Stop() +ThreadError Dhcp6Server::Stop(void) { mSocket.Close(); return kThreadError_None; diff --git a/src/core/net/icmp6.hpp b/src/core/net/icmp6.hpp index 8a1e4bcaa..b17c7d0a5 100644 --- a/src/core/net/icmp6.hpp +++ b/src/core/net/icmp6.hpp @@ -87,7 +87,7 @@ public: * This method initializes the ICMPv6 header to all zeros. * */ - void Init() { mType = 0; mCode = 0; mChecksum = 0; mData.m32[0] = 0; } + void Init(void) { mType = 0; mCode = 0; mChecksum = 0; mData.m32[0] = 0; } /** * ICMPv6 Message Types @@ -106,7 +106,7 @@ public: * @returns The ICMPv6 message type. * */ - Type GetType() const { return static_cast(mType); } + Type GetType(void) const { return static_cast(mType); } /** * This method sets the ICMPv6 message type. @@ -131,7 +131,7 @@ public: * @returns The ICMPv6 message code. * */ - Code GetCode() const { return static_cast(mCode); } + Code GetCode(void) const { return static_cast(mCode); } /** * This method sets the ICMPv6 message code. @@ -146,7 +146,7 @@ public: * @returns The ICMPv6 message checksum. * */ - uint16_t GetChecksum() const { return HostSwap16(mChecksum); } + uint16_t GetChecksum(void) const { return HostSwap16(mChecksum); } /** * This method sets the ICMPv6 message checksum. @@ -162,7 +162,7 @@ public: * @returns The ICMPv6 message ID. * */ - uint16_t GetId() const { return HostSwap16(mData.m16[0]); } + uint16_t GetId(void) const { return HostSwap16(mData.m16[0]); } /** * This method sets the ICMPv6 message ID for Echo Requests and Replies. @@ -178,7 +178,7 @@ public: * @returns The ICMPv6 message sequence. * */ - uint16_t GetSequence() const { return HostSwap16(mData.m16[1]); } + uint16_t GetSequence(void) const { return HostSwap16(mData.m16[1]); } /** * This method sets the ICMPv6 message sequence for Echo Requests and Replies. @@ -194,7 +194,7 @@ public: * @returns The byte offset of the Checksum field. * */ - static uint8_t GetChecksumOffset() { return offsetof(IcmpHeaderPoD, mChecksum); } + static uint8_t GetChecksumOffset(void) { return offsetof(IcmpHeaderPoD, mChecksum); } /** * This static method returns the byte offset of the ICMPv6 payload. @@ -202,7 +202,7 @@ public: * @returns The Byte offset of the ICMPv6 payload. * */ - static uint8_t GetDataOffset() { return offsetof(IcmpHeaderPoD, mData); } + static uint8_t GetDataOffset(void) { return offsetof(IcmpHeaderPoD, mData); } } OT_TOOL_PACKED_END; diff --git a/src/core/net/ip6.hpp b/src/core/net/ip6.hpp index f4ca30af3..eabbdc4aa 100644 --- a/src/core/net/ip6.hpp +++ b/src/core/net/ip6.hpp @@ -336,7 +336,7 @@ public: * @returns The pointer to the parent otInstance structure. * */ - otInstance *GetInstance(); + otInstance *GetInstance(void); /** * This method returns a reference to the send queue. diff --git a/src/core/net/ip6_headers.hpp b/src/core/net/ip6_headers.hpp index 78c523586..692b08d64 100644 --- a/src/core/net/ip6_headers.hpp +++ b/src/core/net/ip6_headers.hpp @@ -137,7 +137,7 @@ public: * This method initializes the IPv6 header. * */ - void Init() { mVersionClassFlow.m32[0] = 0; mVersionClassFlow.m8[0] = kVersion6; } + void Init(void) { mVersionClassFlow.m32[0] = 0; mVersionClassFlow.m8[0] = kVersion6; } /** * This method initializes the IPv6 header and sets Version, Traffic Control and Flow Label fields. @@ -152,7 +152,7 @@ public: * @retval FALSE If the IPv6 Version is not set to 6. * */ - bool IsVersion6() const { return (mVersionClassFlow.m8[0] & kVersionMask) == kVersion6; } + bool IsVersion6(void) const { return (mVersionClassFlow.m8[0] & kVersionMask) == kVersion6; } /** * This method returns the IPv6 Payload Length value. @@ -160,7 +160,7 @@ public: * @returns The IPv6 Payload Length value. * */ - uint16_t GetPayloadLength() { return HostSwap16(mPayloadLength); } + uint16_t GetPayloadLength(void) { return HostSwap16(mPayloadLength); } /** * This method sets the IPv6 Payload Length value. @@ -176,7 +176,7 @@ public: * @returns The IPv6 Next Header value. * */ - IpProto GetNextHeader() const { return static_cast(mNextHeader); } + IpProto GetNextHeader(void) const { return static_cast(mNextHeader); } /** * This method sets the IPv6 Next Header value. @@ -192,7 +192,7 @@ public: * @returns The IPv6 Hop Limit value. * */ - uint8_t GetHopLimit() const { return mHopLimit; } + uint8_t GetHopLimit(void) const { return mHopLimit; } /** * This method sets the IPv6 Hop Limit value. @@ -208,7 +208,7 @@ public: * @returns A reference to the IPv6 Source address. * */ - Address &GetSource() { return static_cast
(mSource); } + Address &GetSource(void) { return static_cast
(mSource); } /** * This method sets the IPv6 Source address. @@ -224,7 +224,7 @@ public: * @returns A reference to the IPv6 Destination address. * */ - Address &GetDestination() { return static_cast
(mDestination); } + Address &GetDestination(void) { return static_cast
(mDestination); } /** * This method sets the IPv6 Destination address. @@ -240,7 +240,7 @@ public: * @returns The byte offset of the IPv6 Payload Length field. * */ - static uint8_t GetPayloadLengthOffset() { return offsetof(HeaderPoD, mPayloadLength); } + static uint8_t GetPayloadLengthOffset(void) { return offsetof(HeaderPoD, mPayloadLength); } /** * This static method returns the byte offset of the IPv6 Hop Limit field. @@ -248,7 +248,7 @@ public: * @returns The byte offset of the IPv6 Hop Limit field. * */ - static uint8_t GetHopLimitOffset() { return offsetof(HeaderPoD, mHopLimit); } + static uint8_t GetHopLimitOffset(void) { return offsetof(HeaderPoD, mHopLimit); } /** * This static method returns the size of the IPv6 Hop Limit field. @@ -256,7 +256,7 @@ public: * @returns The size of the IPv6 Hop Limit field. * */ - static uint8_t GetHopLimitSize() { return sizeof(uint8_t); } + static uint8_t GetHopLimitSize(void) { return sizeof(uint8_t); } /** * This static method returns the byte offset of the IPv6 Destination field. @@ -264,7 +264,7 @@ public: * @returns The byte offset of the IPv6 Destination field. * */ - static uint8_t GetDestinationOffset() { return offsetof(HeaderPoD, mDestination); } + static uint8_t GetDestinationOffset(void) { return offsetof(HeaderPoD, mDestination); } private: enum @@ -288,7 +288,7 @@ public: * @returns The IPv6 Next Header value. * */ - IpProto GetNextHeader() const { return static_cast(mNextHeader); } + IpProto GetNextHeader(void) const { return static_cast(mNextHeader); } /** * This method sets the IPv6 Next Header value. @@ -304,7 +304,7 @@ public: * @returns The IPv6 Header Extension Length value. * */ - uint8_t GetLength() const { return mLength; } + uint8_t GetLength(void) const { return mLength; } /** * This method sets the IPv6 Header Extension Length value. @@ -342,7 +342,7 @@ public: * @returns The IPv6 Option Type value. * */ - uint8_t GetType() const { return mType; } + uint8_t GetType(void) const { return mType; } /** * This method sets the IPv6 Option Type value. @@ -371,7 +371,7 @@ public: * @returns The IPv6 Option action for unrecognized IPv6 Options. * */ - Action GetAction() const { return static_cast(mType & kActionMask); } + Action GetAction(void) const { return static_cast(mType & kActionMask); } /** * This method returns the IPv6 Option Length value. @@ -379,7 +379,7 @@ public: * @returns The IPv6 Option Length value. * */ - uint8_t GetLength() const { return mLength; } + uint8_t GetLength(void) const { return mLength; } /** * This method sets the IPv6 Option Length value. @@ -429,7 +429,7 @@ public: * @returns The total IPv6 Option Length. * */ - uint8_t GetTotalLength() const { return OptionHeader::GetLength() + sizeof(OptionHeader); } + uint8_t GetTotalLength(void) const { return OptionHeader::GetLength() + sizeof(OptionHeader); } private: uint8_t mPad[kMaxLength]; @@ -453,7 +453,7 @@ public: * This method initializes the Pad1 header. * */ - void Init() { mType = kType; } + void Init(void) { mType = kType; } private: uint8_t mType; @@ -472,7 +472,7 @@ public: * This method initializes the IPv6 Fragment header. * */ - void Init() { mReserved = 0; mIdentification = 0; } + void Init(void) { mReserved = 0; mIdentification = 0; } /** * This method returns the IPv6 Next Header value. @@ -480,7 +480,7 @@ public: * @returns The IPv6 Next Header value. * */ - IpProto GetNextHeader() const { return static_cast(mNextHeader); } + IpProto GetNextHeader(void) const { return static_cast(mNextHeader); } /** * This method sets the IPv6 Next Header value. @@ -496,7 +496,7 @@ public: * @returns The Fragment Offset value. * */ - uint16_t GetOffset() { return (HostSwap16(mOffsetMore) & kOffsetMask) >> kOffsetOffset; } + uint16_t GetOffset(void) { return (HostSwap16(mOffsetMore) & kOffsetMask) >> kOffsetOffset; } /** * This method sets the Fragment Offset value. @@ -515,19 +515,19 @@ public: * @returns The M flag value. * */ - bool IsMoreFlagSet() { return HostSwap16(mOffsetMore) & kMoreFlag; } + bool IsMoreFlagSet(void) { return HostSwap16(mOffsetMore) & kMoreFlag; } /** * This method clears the M flag value. * */ - void ClearMoreFlag() { mOffsetMore = HostSwap16(HostSwap16(mOffsetMore) & ~kMoreFlag); } + void ClearMoreFlag(void) { mOffsetMore = HostSwap16(HostSwap16(mOffsetMore) & ~kMoreFlag); } /** * This method sets the M flag value. * */ - void SetMoreFlag() { mOffsetMore = HostSwap16(HostSwap16(mOffsetMore) | kMoreFlag); } + void SetMoreFlag(void) { mOffsetMore = HostSwap16(HostSwap16(mOffsetMore) | kMoreFlag); } private: uint8_t mNextHeader; diff --git a/src/core/net/ip6_mpl.hpp b/src/core/net/ip6_mpl.hpp index 5af36ba35..e5b527b97 100644 --- a/src/core/net/ip6_mpl.hpp +++ b/src/core/net/ip6_mpl.hpp @@ -70,7 +70,7 @@ public: * This method initializes the MPL header. * */ - void Init() { + void Init(void) { OptionHeader::SetType(kType); OptionHeader::SetLength(sizeof(*this) - sizeof(OptionHeader)); mControl = 0; @@ -83,7 +83,7 @@ public: * @returns The total IPv6 Option Length. * */ - uint8_t GetTotalLength() const { return OptionHeader::GetLength() + sizeof(OptionHeader); } + uint8_t GetTotalLength(void) const { return OptionHeader::GetLength() + sizeof(OptionHeader); } /** * MPL Seed Id lengths. @@ -102,7 +102,7 @@ public: * @returns The MPL Seed Id Length value. * */ - SeedIdLength GetSeedIdLength() { return static_cast(mControl & kSeedIdLengthMask); } + SeedIdLength GetSeedIdLength(void) { return static_cast(mControl & kSeedIdLengthMask); } /** * This method sets the MPL Seed Id Length value. @@ -119,19 +119,19 @@ public: * @retval FALSE If the MPL M flag is not set. * */ - bool IsMaxFlagSet() { return (mControl & kMaxFlag) != 0; } + bool IsMaxFlagSet(void) { return (mControl & kMaxFlag) != 0; } /** * This method clears the MPL M flag. * */ - void ClearMaxFlag() { mControl &= ~kMaxFlag; } + void ClearMaxFlag(void) { mControl &= ~kMaxFlag; } /** * This method sets the MPL M flag. * */ - void SetMaxFlag() { mControl |= kMaxFlag; } + void SetMaxFlag(void) { mControl |= kMaxFlag; } /** * This method returns the MPL Sequence value. @@ -139,7 +139,7 @@ public: * @returns The MPL Sequence value. * */ - uint8_t GetSequence() const { return mSequence; } + uint8_t GetSequence(void) const { return mSequence; } /** * This method sets the MPL Sequence value. @@ -155,7 +155,7 @@ public: * @returns The MPL Seed Id value. * */ - uint16_t GetSeedId() const { return HostSwap16(mSeedId); } + uint16_t GetSeedId(void) const { return HostSwap16(mSeedId); } /** * This method sets the MPL Seed Id value. @@ -189,7 +189,7 @@ public: * @returns The MPL Seed Id value. * */ - uint16_t GetSeedId() const { return mSeedId; } + uint16_t GetSeedId(void) const { return mSeedId; } /** * This method sets the MPL Seed Id value. @@ -205,7 +205,7 @@ public: * @returns The MPL Sequence value. * */ - uint8_t GetSequence() const { return mSequence; } + uint8_t GetSequence(void) const { return mSequence; } /** * This method sets the MPL Sequence value. @@ -221,7 +221,7 @@ public: * @returns The MPL Seed Set entry's remaining lifetime. * */ - uint8_t GetLifetime() const { return mLifetime; } + uint8_t GetLifetime(void) const { return mLifetime; } /** * This method sets the remaining lifetime of the Seed Set entry. @@ -332,7 +332,7 @@ public: * @returns The MPL Seed Id value. * */ - uint16_t GetSeedId() const { return mSeedId; } + uint16_t GetSeedId(void) const { return mSeedId; } /** * This method sets the MPL Seed Id value. @@ -348,7 +348,7 @@ public: * @returns The MPL Sequence value. * */ - uint8_t GetSequence() const { return mSequence; } + uint8_t GetSequence(void) const { return mSequence; } /** * This method sets the MPL Sequence value. @@ -364,7 +364,7 @@ public: * @returns The number of already preformed transmissions. * */ - uint8_t GetTransmissionCount() const { return mTransmissionCount; } + uint8_t GetTransmissionCount(void) const { return mTransmissionCount; } /** * This method sets the number of already performed transmissions. @@ -380,7 +380,7 @@ public: * @returns The transmission timestamp of the message. * */ - uint32_t GetTransmissionTime() const { return mTransmissionTime; } + uint32_t GetTransmissionTime(void) const { return mTransmissionTime; } /** * This method sets the transmission timestamp of the message. @@ -396,7 +396,7 @@ public: * @returns The offset from the the transmission time to the end of trickle interval. * */ - uint8_t GetIntervalOffset() const { return mIntervalOffset; } + uint8_t GetIntervalOffset(void) const { return mIntervalOffset; } /** * This method sets the offset from the transmission time to the end of trickle interval. @@ -468,7 +468,7 @@ public: * @returns The MPL Seed Id value. * */ - uint16_t GetSeedId() const { return mSeedId; } + uint16_t GetSeedId(void) const { return mSeedId; } /** * This method sets the MPL Seed Id value. @@ -485,7 +485,7 @@ public: * @returns The MPL number of Trickle timer expirations. * */ - uint8_t GetTimerExpirations() const { return mTimerExpirations; } + uint8_t GetTimerExpirations(void) const { return mTimerExpirations; } /** * This method sets the MPL number of Trickle timer expirations that occur before @@ -526,10 +526,10 @@ private: void AddBufferedMessage(Message &aMessage, uint16_t aSeedId, uint8_t aSequence, bool aIsOutbound); static void HandleSeedSetTimer(void *aContext); - void HandleSeedSetTimer(); + void HandleSeedSetTimer(void); static void HandleRetransmissionTimer(void *aContext); - void HandleRetransmissionTimer(); + void HandleRetransmissionTimer(void); Ip6 &mIp6; diff --git a/src/core/thread/energy_scan_server.hpp b/src/core/thread/energy_scan_server.hpp index 1c5fef26a..8fecce7d6 100644 --- a/src/core/thread/energy_scan_server.hpp +++ b/src/core/thread/energy_scan_server.hpp @@ -83,7 +83,7 @@ private: static void HandleNetifStateChanged(uint32_t aFlags, void *aContext); void HandleNetifStateChanged(uint32_t aFlags); - ThreadError SendReport(); + ThreadError SendReport(void); ThreadError SendResponse(const Coap::Header &aRequestHeader, const Ip6::MessageInfo &aRequestMessageInfo); Ip6::Address mCommissioner; diff --git a/src/core/thread/lowpan.hpp b/src/core/thread/lowpan.hpp index 5a3c03b41..65b957d20 100644 --- a/src/core/thread/lowpan.hpp +++ b/src/core/thread/lowpan.hpp @@ -230,7 +230,7 @@ public: * Default constructor for the object. * */ - MeshHeader() { memset(this, 0, sizeof(*this)); } + MeshHeader(void) { memset(this, 0, sizeof(*this)); } /** * Mesh Header constructor that takes frame @p aFrame as a parameter. @@ -265,7 +265,7 @@ public: * This method initializes the header. * */ - void Init() { mDispatchHopsLeft = kDispatch | kSourceShort | kDestinationShort; } + void Init(void) { mDispatchHopsLeft = kDispatch | kSourceShort | kDestinationShort; } /** * This method indicates whether or not the header is a Mesh Header. @@ -274,7 +274,7 @@ public: * @retval FALSE If the header does not match the Mesh Header dispatch value. * */ - bool IsMeshHeader() { return (mDispatchHopsLeft & kDispatchMask) == kDispatch; } + bool IsMeshHeader(void) { return (mDispatchHopsLeft & kDispatchMask) == kDispatch; } /** * This method indicates whether or not the Mesh Header appears to be well-formed. @@ -283,7 +283,7 @@ public: * @retval FALSE If the header does not appear to be well-formed. * */ - bool IsValid() { return (mDispatchHopsLeft & kSourceShort) && (mDispatchHopsLeft & kDestinationShort); } + bool IsValid(void) { return (mDispatchHopsLeft & kSourceShort) && (mDispatchHopsLeft & kDestinationShort); } /** * This method indicates whether or not the header contains Deep Hops Left field. @@ -292,7 +292,7 @@ public: * @retval FALSE If the header does not contain Deep Hops Left field. * */ - bool IsDeepHopsLeftField() { return (mDispatchHopsLeft & kHopsLeftMask) == kDeepHopsLeft; } + bool IsDeepHopsLeftField(void) { return (mDispatchHopsLeft & kHopsLeftMask) == kDeepHopsLeft; } /** * This static method returns the size of the Mesh Header in bytes. @@ -300,7 +300,7 @@ public: * @returns The size of the Mesh Header in bytes. * */ - uint8_t GetHeaderLength() { return sizeof(*this) - (IsDeepHopsLeftField() ? 0 : sizeof(mDeepHopsLeft)) ; } + uint8_t GetHeaderLength(void) { return sizeof(*this) - (IsDeepHopsLeftField() ? 0 : sizeof(mDeepHopsLeft)) ; } /** * This method returns the Hops Left value. @@ -308,7 +308,7 @@ public: * @returns The Hops Left value. * */ - uint8_t GetHopsLeft() { return IsDeepHopsLeftField() ? mDeepHopsLeft : mDispatchHopsLeft & kHopsLeftMask; } + uint8_t GetHopsLeft(void) { return IsDeepHopsLeftField() ? mDeepHopsLeft : mDispatchHopsLeft & kHopsLeftMask; } /** * This method sets the Hops Left value. @@ -332,7 +332,7 @@ public: * @returns The Mesh Source address. * */ - uint16_t GetSource() { return HostSwap16(mAddress.mSource); } + uint16_t GetSource(void) { return HostSwap16(mAddress.mSource); } /** * This method sets the Mesh Source address. @@ -348,7 +348,7 @@ public: * @returns The Mesh Destination address. * */ - uint16_t GetDestination() { return HostSwap16(mAddress.mDestination); } + uint16_t GetDestination(void) { return HostSwap16(mAddress.mDestination); } /** * This method sets the Mesh Destination address. @@ -406,7 +406,7 @@ public: * This method initializes the Fragment Header. * */ - void Init() { mDispatchSize = HostSwap16(kDispatch); } + void Init(void) { mDispatchSize = HostSwap16(kDispatch); } /** * This method indicates whether or not the header is a Fragment Header. @@ -415,7 +415,7 @@ public: * @retval FALSE If the header does not match the Fragment Header dispatch value. * */ - bool IsFragmentHeader() { return (HostSwap16(mDispatchSize) & kDispatchMask) == kDispatch; } + bool IsFragmentHeader(void) { return (HostSwap16(mDispatchSize) & kDispatchMask) == kDispatch; } /** * This method returns the Fragment Header length. @@ -423,7 +423,7 @@ public: * @returns The Fragment Header length in bytes. * */ - uint8_t GetHeaderLength() { + uint8_t GetHeaderLength(void) { return (HostSwap16(mDispatchSize) & kOffset) ? sizeof(*this) : sizeof(*this) - sizeof(mOffset); } @@ -433,7 +433,7 @@ public: * @returns The Datagram Size value. * */ - uint16_t GetDatagramSize() { return HostSwap16(mDispatchSize) & kSizeMask; } + uint16_t GetDatagramSize(void) { return HostSwap16(mDispatchSize) & kSizeMask; } /** * This method sets the Datagram Size value. @@ -451,7 +451,7 @@ public: * @returns The Datagram Tag value. * */ - uint16_t GetDatagramTag() { return HostSwap16(mTag); } + uint16_t GetDatagramTag(void) { return HostSwap16(mTag); } /** * This method sets the Datagram Tag value. @@ -467,7 +467,7 @@ public: * @returns The Datagram Offset value. * */ - uint16_t GetDatagramOffset() { return (HostSwap16(mDispatchSize) & kOffset) ? static_cast(mOffset) * 8 : 0; } + uint16_t GetDatagramOffset(void) { return (HostSwap16(mDispatchSize) & kOffset) ? static_cast(mOffset) * 8 : 0; } /** * This method sets the Datagram Offset value. diff --git a/src/core/thread/mesh_forwarder.cpp b/src/core/thread/mesh_forwarder.cpp index 783ff8cb9..d67f74a56 100644 --- a/src/core/thread/mesh_forwarder.cpp +++ b/src/core/thread/mesh_forwarder.cpp @@ -88,7 +88,7 @@ MeshForwarder::MeshForwarder(ThreadNetif &aThreadNetif): mMacDest.mLength = 0; } -ThreadError MeshForwarder::Start() +ThreadError MeshForwarder::Start(void) { ThreadError error = kThreadError_None; @@ -101,7 +101,7 @@ ThreadError MeshForwarder::Start() return error; } -ThreadError MeshForwarder::Stop() +ThreadError MeshForwarder::Stop(void) { ThreadError error = kThreadError_None; Message *message; @@ -256,7 +256,7 @@ exit: (void) error; } -ThreadError MeshForwarder::AddPendingSrcMatchEntries() +ThreadError MeshForwarder::AddPendingSrcMatchEntries(void) { uint8_t numChildren; Child *children = NULL; diff --git a/src/core/thread/mesh_forwarder.hpp b/src/core/thread/mesh_forwarder.hpp index 2dde21c2c..73d541c01 100644 --- a/src/core/thread/mesh_forwarder.hpp +++ b/src/core/thread/mesh_forwarder.hpp @@ -248,7 +248,7 @@ private: static void ScheduleTransmissionTask(void *aContext); void ScheduleTransmissionTask(void); - ThreadError AddPendingSrcMatchEntries(); + ThreadError AddPendingSrcMatchEntries(void); ThreadError AddSrcMatchEntry(Child &aChild); void ClearSrcMatchEntry(Child &aChild); diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index b433dcc1d..edb6cf481 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -256,7 +256,7 @@ ThreadError Mle::Stop(bool aClearNetworkDatasets) return kThreadError_None; } -ThreadError Mle::Restore() +ThreadError Mle::Restore(void) { ThreadError error = kThreadError_None; NetworkInfo networkInfo; @@ -295,7 +295,7 @@ exit: return error; } -ThreadError Mle::Store() +ThreadError Mle::Store(void) { ThreadError error = kThreadError_None; NetworkInfo networkInfo; diff --git a/src/core/thread/network_data_tlvs.hpp b/src/core/thread/network_data_tlvs.hpp index e2e11d353..3c449adb1 100644 --- a/src/core/thread/network_data_tlvs.hpp +++ b/src/core/thread/network_data_tlvs.hpp @@ -66,7 +66,7 @@ public: * This method initializes TLV. * */ - void Init() { mType = 0; mLength = 0; } + void Init(void) { mType = 0; mLength = 0; } /** * Thread Network Data Type values. @@ -87,7 +87,7 @@ public: * @returns The Type value. * */ - Type GetType() const { return static_cast(mType >> kTypeOffset); } + Type GetType(void) const { return static_cast(mType >> kTypeOffset); } /** * This method sets the Type value. @@ -105,7 +105,7 @@ public: * @returns The Length value. * */ - uint8_t GetLength() const { return mLength; } + uint8_t GetLength(void) const { return mLength; } /** * This method sets the Length value. @@ -121,7 +121,7 @@ public: * @returns A pointer to the value. * */ - uint8_t *GetValue() { return reinterpret_cast(this) + sizeof(NetworkDataTlv); } + uint8_t *GetValue(void) { return reinterpret_cast(this) + sizeof(NetworkDataTlv); } /** * This method returns a pointer to the next Network Data TLV. @@ -129,7 +129,7 @@ public: * @returns A pointer to the next Network Data TLV. * */ - NetworkDataTlv *GetNext() { + NetworkDataTlv *GetNext(void) { return reinterpret_cast(reinterpret_cast(this) + sizeof(*this) + mLength); } @@ -137,7 +137,7 @@ public: * This method clears the Stable bit. * */ - void ClearStable() { mType &= ~kStableMask; } + void ClearStable(void) { mType &= ~kStableMask; } /** * This method indicates whether or not the Stable bit is set. @@ -146,13 +146,13 @@ public: * @retval FALSE If the Stable bit is not set. * */ - bool IsStable() const { return (mType & kStableMask); } + bool IsStable(void) const { return (mType & kStableMask); } /** * This method sets the Stable bit. * */ - void SetStable() { mType |= kStableMask; } + void SetStable(void) { mType |= kStableMask; } private: enum @@ -177,14 +177,14 @@ public: * This method initializes the header. * */ - void Init() { SetRloc(Mac::kShortAddrInvalid); mFlags = 0; } + void Init(void) { SetRloc(Mac::kShortAddrInvalid); mFlags = 0; } /** * This method returns the RLOC16 value. * * @returns The RLOC16 value. */ - uint16_t GetRloc() const { return HostSwap16(mRloc); } + uint16_t GetRloc(void) const { return HostSwap16(mRloc); } /** * This method sets the RLOC16 value. @@ -200,7 +200,7 @@ public: * @returns The preference value. * */ - int8_t GetPreference() const { return static_cast(mFlags) >> kPreferenceOffset; } + int8_t GetPreference(void) const { return static_cast(mFlags) >> kPreferenceOffset; } /** * This method sets the Preference value. @@ -235,7 +235,7 @@ public: * This method initializes the TLV. * */ - void Init() { NetworkDataTlv::Init(); SetType(kTypeHasRoute); SetLength(0); } + void Init(void) { NetworkDataTlv::Init(); SetType(kTypeHasRoute); SetLength(0); } /** * This method returns the number of HasRoute entries. @@ -243,7 +243,7 @@ public: * @returns The number of HasRoute entries. * */ - uint8_t GetNumEntries() const { return GetLength() / sizeof(HasRouteEntry); } + uint8_t GetNumEntries(void) const { return GetLength() / sizeof(HasRouteEntry); } /** * This method returns a pointer to the i'th HasRoute entry. @@ -289,7 +289,7 @@ public: * @returns The Domain ID value. * */ - uint8_t GetDomainId() const { return mDomainId; } + uint8_t GetDomainId(void) const { return mDomainId; } /** * This method returns the Prefix Length value. @@ -297,7 +297,7 @@ public: * @returns The Prefix Length value. * */ - uint8_t GetPrefixLength() const { return mPrefixLength; } + uint8_t GetPrefixLength(void) const { return mPrefixLength; } /** * This method returns a pointer to the Prefix. @@ -305,7 +305,7 @@ public: * @returns A pointer to the Prefix. * */ - uint8_t *GetPrefix() { return reinterpret_cast(this) + sizeof(*this); } + uint8_t *GetPrefix(void) { return reinterpret_cast(this) + sizeof(*this); } /** * This method returns a pointer to the Sub-TLVs. @@ -313,7 +313,7 @@ public: * @returns A pointer to the Sub-TLVs. * */ - NetworkDataTlv *GetSubTlvs() { + NetworkDataTlv *GetSubTlvs(void) { return reinterpret_cast(GetPrefix() + BitVectorBytes(mPrefixLength)); } @@ -324,7 +324,7 @@ public: * @returns The Sub-TLVs length in bytes. * */ - uint8_t GetSubTlvsLength() const { + uint8_t GetSubTlvsLength(void) const { return GetLength() - (sizeof(*this) - sizeof(NetworkDataTlv) + BitVectorBytes(mPrefixLength)); } @@ -367,14 +367,14 @@ public: * This method initializes the TLV. * */ - void Init() { SetRloc(Mac::kShortAddrInvalid); mFlags = 0; mReserved = 0; } + void Init(void) { SetRloc(Mac::kShortAddrInvalid); mFlags = 0; mReserved = 0; } /** * This method returns the RLOC16 value. * * @returns The RLOC16 value. */ - uint16_t GetRloc() const { return HostSwap16(mRloc); } + uint16_t GetRloc(void) const { return HostSwap16(mRloc); } /** * This method sets the RLOC16 value. @@ -390,7 +390,7 @@ public: * @returns The Flags byte value. * */ - uint8_t GetFlags() const { return mFlags & ~kPreferenceMask; } + uint8_t GetFlags(void) const { return mFlags & ~kPreferenceMask; } /** * This method sets the Flags byte value. @@ -406,7 +406,7 @@ public: * @returns the Preference value. * */ - int8_t GetPreference() const { return static_cast(mFlags) >> kPreferenceOffset; } + int8_t GetPreference(void) const { return static_cast(mFlags) >> kPreferenceOffset; } /** * This method sets the Preference value. @@ -425,19 +425,19 @@ public: * @retval FALSE If the Preferred flag is not set. * */ - bool IsPreferred() const { return (mFlags & kPreferredFlag) != 0; } + bool IsPreferred(void) const { return (mFlags & kPreferredFlag) != 0; } /** * This method clears the Preferred flag. * */ - void ClearPreferred() { mFlags &= ~kPreferredFlag; } + void ClearPreferred(void) { mFlags &= ~kPreferredFlag; } /** * This method sets the Preferred flag. * */ - void SetPreferred() { mFlags |= kPreferredFlag; } + void SetPreferred(void) { mFlags |= kPreferredFlag; } /** * This method indicates whether or not the SLAAC flag is set. @@ -446,19 +446,19 @@ public: * @retval FALSE If the SLAAC flag is not set. * */ - bool IsSlaac() const { return (mFlags & kSlaacFlag) != 0; } + bool IsSlaac(void) const { return (mFlags & kSlaacFlag) != 0; } /** * This method clears the SLAAC flag. * */ - void ClearSlaac() { mFlags &= ~kSlaacFlag; } + void ClearSlaac(void) { mFlags &= ~kSlaacFlag; } /** * This method sets the SLAAC flag. * */ - void SetSlaac() { mFlags |= kSlaacFlag; } + void SetSlaac(void) { mFlags |= kSlaacFlag; } /** * This method indicates whether or not the DHCP flag is set. @@ -467,19 +467,19 @@ public: * @retval FALSE If the DHCP flag is not set. * */ - bool IsDhcp() const { return (mFlags & kDhcpFlag) != 0; } + bool IsDhcp(void) const { return (mFlags & kDhcpFlag) != 0; } /** * This method clears the DHCP flag. * */ - void ClearDhcp() { mFlags &= ~kDhcpFlag; } + void ClearDhcp(void) { mFlags &= ~kDhcpFlag; } /** * This method sets the DHCP flag. * */ - void SetDhcp() { mFlags |= kDhcpFlag; } + void SetDhcp(void) { mFlags |= kDhcpFlag; } /** * This method indicates whether or not the Configure flag is set. @@ -488,19 +488,19 @@ public: * @retval FALSE If the Configure flag is not set. * */ - bool IsConfigure() const { return (mFlags & kConfigureFlag) != 0; } + bool IsConfigure(void) const { return (mFlags & kConfigureFlag) != 0; } /** * This method clears the Configure flag. * */ - void ClearConfigure() { mFlags &= ~kConfigureFlag; } + void ClearConfigure(void) { mFlags &= ~kConfigureFlag; } /** * This method sets the Configure flag. * */ - void SetConfigure() { mFlags |= kConfigureFlag; } + void SetConfigure(void) { mFlags |= kConfigureFlag; } /** * This method indicates whether or not the Default Route flag is set. @@ -509,19 +509,19 @@ public: * @retval FALSE If the Default Route flag is not set. * */ - bool IsDefaultRoute() const { return (mFlags & kDefaultRouteFlag) != 0; } + bool IsDefaultRoute(void) const { return (mFlags & kDefaultRouteFlag) != 0; } /** * This method clears the Default Route flag. * */ - void ClearDefaultRoute() { mFlags &= ~kDefaultRouteFlag; } + void ClearDefaultRoute(void) { mFlags &= ~kDefaultRouteFlag; } /** * This method sets the Default Route flag. * */ - void SetDefaultRoute() { mFlags |= kDefaultRouteFlag; } + void SetDefaultRoute(void) { mFlags |= kDefaultRouteFlag; } /** * This method indicates whether or not the On-Mesh flag is set. @@ -530,19 +530,19 @@ public: * @retval FALSE If the On-Mesh flag is not set. * */ - bool IsOnMesh() const { return (mFlags & kOnMeshFlag) != 0; } + bool IsOnMesh(void) const { return (mFlags & kOnMeshFlag) != 0; } /** * This method clears the On-Mesh flag. * */ - void ClearOnMesh() { mFlags &= ~kOnMeshFlag; } + void ClearOnMesh(void) { mFlags &= ~kOnMeshFlag; } /** * This method sets the On-Mesh flag. * */ - void SetOnMesh() { mFlags |= kOnMeshFlag; } + void SetOnMesh(void) { mFlags |= kOnMeshFlag; } private: uint16_t mRloc; @@ -562,7 +562,7 @@ public: * This method initializes the TLV. * */ - void Init() { NetworkDataTlv::Init(); SetType(kTypeBorderRouter); SetLength(0); } + void Init(void) { NetworkDataTlv::Init(); SetType(kTypeBorderRouter); SetLength(0); } /** * This method returns the number of Border Router entries. @@ -570,7 +570,7 @@ public: * @returns The number of Border Router entries. * */ - uint8_t GetNumEntries() const { return GetLength() / sizeof(BorderRouterEntry); } + uint8_t GetNumEntries(void) const { return GetLength() / sizeof(BorderRouterEntry); } /** * This method returns a pointer to the i'th Border Router entry. @@ -597,7 +597,7 @@ public: * This method initializes the TLV. * */ - void Init() { NetworkDataTlv::Init(); SetType(kTypeContext); SetLength(2); mFlags = 0; mContextLength = 0; } + void Init(void) { NetworkDataTlv::Init(); SetType(kTypeContext); SetLength(2); mFlags = 0; mContextLength = 0; } /** * This method indicates whether or not the Compress flag is set. @@ -606,19 +606,19 @@ public: * @retval FALSE The Compress flags is not set. * */ - bool IsCompress() const { return (mFlags & kCompressFlag) != 0; } + bool IsCompress(void) const { return (mFlags & kCompressFlag) != 0; } /** * This method clears the Compress flag. * */ - void ClearCompress() { mFlags &= ~kCompressFlag; } + void ClearCompress(void) { mFlags &= ~kCompressFlag; } /** * This method sets the Compress flag. * */ - void SetCompress() { mFlags |= kCompressFlag; } + void SetCompress(void) { mFlags |= kCompressFlag; } /** * This method returns the Context ID value. @@ -626,7 +626,7 @@ public: * @returns The Context ID value. * */ - uint8_t GetContextId() const { return mFlags & kContextIdMask; } + uint8_t GetContextId(void) const { return mFlags & kContextIdMask; } /** * This method sets the Context ID value. @@ -644,7 +644,7 @@ public: * @returns The Context Length value. * */ - uint8_t GetContextLength() const { return mContextLength; } + uint8_t GetContextLength(void) const { return mContextLength; } /** * This method sets the Context Length value. @@ -677,7 +677,7 @@ public: * This method initializes the TLV. * */ - void Init() { NetworkDataTlv::Init(); SetType(kTypeCommissioningData); SetLength(0); } + void Init(void) { NetworkDataTlv::Init(); SetType(kTypeCommissioningData); SetLength(0); } } OT_TOOL_PACKED_END; /** diff --git a/src/core/thread/network_diagnostic_tlvs.hpp b/src/core/thread/network_diagnostic_tlvs.hpp index e7f4a3103..a0071c70f 100644 --- a/src/core/thread/network_diagnostic_tlvs.hpp +++ b/src/core/thread/network_diagnostic_tlvs.hpp @@ -1262,7 +1262,7 @@ public: */ bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(NetworkDiagnosticTlv); } - uint8_t GetNumEntries() const { return GetLength() / sizeof(ChildTableEntry); } + uint8_t GetNumEntries(void) const { return GetLength() / sizeof(ChildTableEntry); } ChildTableEntry &GetEntry(uint8_t i) { return mChildTableEntry[i]; @@ -1296,7 +1296,7 @@ public: */ bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(NetworkDiagnosticTlv); } - uint8_t *GetChannelPages() { return mChannelPages; } + uint8_t *GetChannelPages(void) { return mChannelPages; } private: uint8_t mChannelPages[1]; diff --git a/src/core/thread/panid_query_server.hpp b/src/core/thread/panid_query_server.hpp index ba95db851..bed352d88 100644 --- a/src/core/thread/panid_query_server.hpp +++ b/src/core/thread/panid_query_server.hpp @@ -80,7 +80,7 @@ private: static void HandleUdpReceive(void *aContext, otMessage aMessage, const otMessageInfo *aMessageInfo); - ThreadError SendConflict(); + ThreadError SendConflict(void); ThreadError SendQueryResponse(const Coap::Header &aRequestHeader, const Ip6::MessageInfo &aRequestMessageInfo); Ip6::Address mCommissioner; diff --git a/src/core/thread/thread_tlvs.hpp b/src/core/thread/thread_tlvs.hpp index 1e91090a2..d2974a635 100644 --- a/src/core/thread/thread_tlvs.hpp +++ b/src/core/thread/thread_tlvs.hpp @@ -82,7 +82,7 @@ public: * @returns The Type value. * */ - Type GetType() const { return static_cast(mType); } + Type GetType(void) const { return static_cast(mType); } /** * This method sets the Type value. @@ -96,7 +96,7 @@ public: * This method returns the Length value. * */ - uint8_t GetLength() const { return mLength; } + uint8_t GetLength(void) const { return mLength; } /** * This method sets the Length value. @@ -137,7 +137,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kTarget); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } + void Init(void) { SetType(kTarget); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -146,7 +146,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } /** * This method returns a pointer to the Target EID. @@ -154,7 +154,7 @@ public: * @returns A pointer to the Target EID. * */ - const Ip6::Address *GetTarget() const { return &mTarget; } + const Ip6::Address *GetTarget(void) const { return &mTarget; } /** * This method sets the Target EID. @@ -179,7 +179,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kExtMacAddress); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } + void Init(void) { SetType(kExtMacAddress); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -188,7 +188,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } /** * This method returns a pointer to the Extended MAC Address. @@ -196,7 +196,7 @@ public: * @returns A pointer to the Extended MAC Address. * */ - const Mac::ExtAddress *GetMacAddr() const { return &mMacAddr; } + const Mac::ExtAddress *GetMacAddr(void) const { return &mMacAddr; } /** * This method sets the Extended MAC Address. @@ -222,7 +222,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kRloc16); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } + void Init(void) { SetType(kRloc16); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -231,7 +231,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } /** * This method returns the RLOC16 value. @@ -239,7 +239,7 @@ public: * @returns The RLOC16 value. * */ - uint16_t GetRloc16() const { return HostSwap16(mRloc16); } + uint16_t GetRloc16(void) const { return HostSwap16(mRloc16); } /** * This method sets the RLOC16 value. @@ -265,7 +265,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kMeshLocalEid); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } + void Init(void) { SetType(kMeshLocalEid); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -274,7 +274,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } /** * This method returns a pointer to the ML-EID IID. @@ -282,7 +282,7 @@ public: * @returns A pointer to the Extended MAC Address. * */ - const uint8_t *GetIid() const { return mIid; } + const uint8_t *GetIid(void) const { return mIid; } /** * This method sets the ML-EID IID. @@ -308,7 +308,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kStatus); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } + void Init(void) { SetType(kStatus); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -317,7 +317,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } /** * Status values. @@ -338,7 +338,7 @@ public: * @returns The Status value. * */ - Status GetStatus() const { return static_cast(mStatus); } + Status GetStatus(void) const { return static_cast(mStatus); } /** * This method sets the Status value. @@ -364,7 +364,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kLastTransactionTime); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } + void Init(void) { SetType(kLastTransactionTime); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -373,7 +373,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } /** * This method returns the Last Transaction Time value. @@ -381,7 +381,7 @@ public: * @returns The Last Transaction Time value. * */ - uint32_t GetTime() const { return HostSwap32(mTime); } + uint32_t GetTime(void) const { return HostSwap32(mTime); } /** * This method sets the Last Transaction Time value. @@ -407,7 +407,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kRouterMask); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } + void Init(void) { SetType(kRouterMask); SetLength(sizeof(*this) - sizeof(ThreadTlv)); } /** * This method indicates whether or not the TLV appears to be well-formed. @@ -416,7 +416,7 @@ public: * @retval FALSE If the TLV does not appear to be well-formed. * */ - bool IsValid() const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } + bool IsValid(void) const { return GetLength() == sizeof(*this) - sizeof(ThreadTlv); } /** * This method returns the ID Sequence value. @@ -424,7 +424,7 @@ public: * @returns The ID Sequence value. * */ - uint8_t GetIdSequence() const { return mIdSequence; } + uint8_t GetIdSequence(void) const { return mIdSequence; } /** * This method sets the ID Sequence value. @@ -438,7 +438,7 @@ public: * This method clears the Assigned Router ID Mask. * */ - void ClearAssignedRouterIdMask() { memset(mAssignedRouterIdMask, 0, sizeof(mAssignedRouterIdMask)); } + void ClearAssignedRouterIdMask(void) { memset(mAssignedRouterIdMask, 0, sizeof(mAssignedRouterIdMask)); } /** * This method indicates whether or not a given Router ID is set in the Assigned Router ID Mask. @@ -478,7 +478,7 @@ public: * This method initializes the TLV. * */ - void Init() { SetType(kThreadNetworkData); SetLength(0); } + void Init(void) { SetType(kThreadNetworkData); SetLength(0); } /** * This method overrides same method of the base class @@ -486,7 +486,7 @@ public: * @retval TRUE the TLV appears to be well-formed. * */ - bool IsValid() const { return true; } + bool IsValid(void) const { return true; } /** * This method returns a pointer to the Network Data TLVs. diff --git a/src/diag/diag_process.hpp b/src/diag/diag_process.hpp index bacaf294e..ea0a10cec 100644 --- a/src/diag/diag_process.hpp +++ b/src/diag/diag_process.hpp @@ -65,7 +65,7 @@ class Diag public: static void Init(otInstance *aInstance); static char *ProcessCmd(int argc, char *argv[]); - static bool isEnabled(); + static bool isEnabled(void); static void DiagTransmitDone(otInstance *aInstance, bool aRxPending, ThreadError aError); static void DiagReceiveDone(otInstance *aInstance, RadioPacket *aFrame, ThreadError aError); @@ -81,7 +81,7 @@ private: static void ProcessStats(int argc, char *argv[], char *aOutput, size_t aOutputMaxLen); static void ProcessChannel(int argc, char *argv[], char *aOutput, size_t aOutputMaxLen); static void ProcessPower(int argc, char *argv[], char *aOutput, size_t aOutputMaxLen); - static void TxPacket(); + static void TxPacket(void); static ThreadError ParseLong(char *aString, long &aLong); static char sDiagOutput[];