From 9c75d709ad45ddf944b3c7b355df02679253723e Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Thu, 8 Sep 2016 16:08:50 -0700 Subject: [PATCH] Fix pretty check escapes. (#544) --- .travis/script.sh | 2 +- src/core/meshcop/commissioner.cpp | 2 +- src/core/meshcop/dtls.cpp | 2 +- src/core/meshcop/joiner.cpp | 20 ++++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis/script.sh b/.travis/script.sh index 4583d9731..9bc5d038b 100755 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -38,7 +38,7 @@ set -x [ $BUILD_TARGET != pretty-check ] || { export PATH=/tmp/astyle/build/gcc/bin:$PATH || die - ./configure || die + ./configure --enable-cli --enable-diag --enable-commissioner --enable-joiner --with-examples=posix || die make pretty-check || die } diff --git a/src/core/meshcop/commissioner.cpp b/src/core/meshcop/commissioner.cpp index ce2e02413..22591711f 100644 --- a/src/core/meshcop/commissioner.cpp +++ b/src/core/meshcop/commissioner.cpp @@ -246,7 +246,7 @@ exit: void Commissioner::HandleUdpReceive(void *aContext, otMessage aMessage, const otMessageInfo *aMessageInfo) { static_cast(aContext)->HandleUdpReceive(*static_cast(aMessage), - *static_cast(aMessageInfo)); + *static_cast(aMessageInfo)); } void Commissioner::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageInfo) diff --git a/src/core/meshcop/dtls.cpp b/src/core/meshcop/dtls.cpp index 46dad992d..96b571300 100644 --- a/src/core/meshcop/dtls.cpp +++ b/src/core/meshcop/dtls.cpp @@ -272,7 +272,7 @@ int Dtls::HandleMbedtlsExportKeys(void *aContext, const unsigned char *aMasterSe size_t aMacLength, size_t aKeyLength, size_t aIvLength) { return static_cast(aContext)->HandleMbedtlsExportKeys(aMasterSecret, aKeyBlock, - aMacLength, aKeyLength, aIvLength); + aMacLength, aKeyLength, aIvLength); } int Dtls::HandleMbedtlsExportKeys(const unsigned char *aMasterSecret, const unsigned char *aKeyBlock, diff --git a/src/core/meshcop/joiner.cpp b/src/core/meshcop/joiner.cpp index 6234bc191..09b8626a6 100644 --- a/src/core/meshcop/joiner.cpp +++ b/src/core/meshcop/joiner.cpp @@ -72,19 +72,19 @@ void Joiner::HandleDiscoverResult(otActiveScanResult *aResult) { if (aResult != NULL) { - memcpy(&mJoinerRouter, &aResult->mExtAddress, sizeof(mJoinerRouter)); + memcpy(&mJoinerRouter, &aResult->mExtAddress, sizeof(mJoinerRouter)); } else { - // open UDP port - Ip6::SockAddr sockaddr; - sockaddr.mPort = 1000; - mSocket.Open(&HandleUdpReceive, this); - mSocket.Bind(sockaddr); + // open UDP port + Ip6::SockAddr sockaddr; + sockaddr.mPort = 1000; + mSocket.Open(&HandleUdpReceive, this); + mSocket.Bind(sockaddr); - mNetif.GetIp6Filter().AddUnsecurePort(sockaddr.mPort); + mNetif.GetIp6Filter().AddUnsecurePort(sockaddr.mPort); - mNetif.GetDtls().Start(true, HandleDtlsReceive, HandleDtlsSend, this); + mNetif.GetDtls().Start(true, HandleDtlsReceive, HandleDtlsSend, this); } } @@ -138,7 +138,7 @@ void Joiner::HandleUdpReceive(void *aContext, otMessage aMessage, const otMessag { otLogInfoMeshCoP("Joiner::HandleUdpReceive\r\n"); static_cast(aContext)->HandleUdpReceive(*static_cast(aMessage), - *static_cast(aMessageInfo)); + *static_cast(aMessageInfo)); } void Joiner::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessageInfo) @@ -154,7 +154,7 @@ void Joiner::HandleUdpReceive(Message &aMessage, const Ip6::MessageInfo &aMessag } void Joiner::HandleUdpTransmit(void *aContext) -{ +{ otLogInfoMeshCoP("Joiner::HandleUdpTransmit\r\n"); static_cast(aContext)->HandleUdpTransmit(); }