From 6a815e147a8f696b30427fae8c43b172b99db3f1 Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@nestlabs.com>
Date: Fri, 1 Jul 2016 17:52:27 -0700
Subject: [PATCH] Fix compiler warnings. (#234)

---
 src/cli/cli.cpp      | 11 +++++++----
 src/core/mac/mac.cpp |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp
index d02c0d749..6fff45f48 100644
--- a/src/cli/cli.cpp
+++ b/src/cli/cli.cpp
@@ -228,7 +228,7 @@ void Interpreter::ProcessChild(int argc, char *argv[])
     sServer->OutputFormat("Rloc: %04x\r\n", childInfo.mRloc16);
     sServer->OutputFormat("Ext Addr: ");
 
-    for (int j = 0; j < sizeof(childInfo.mExtAddress); j++)
+    for (size_t j = 0; j < sizeof(childInfo.mExtAddress); j++)
     {
         sServer->OutputFormat("%02x", childInfo.mExtAddress.m8[j]);
     }
@@ -686,7 +686,8 @@ void Interpreter::HandleEchoResponse(void *aContext, Message &aMessage, const Ip
                           HostSwap16(aMessageInfo.GetPeerAddr().mFields.m16[7]));
     sServer->OutputFormat(": icmp_seq=%d hlim=%d", icmp6Header.GetSequence(), aMessageInfo.mHopLimit);
 
-    if (aMessage.Read(aMessage.GetOffset() + sizeof(icmp6Header), sizeof(uint32_t), &timestamp) >= sizeof(uint32_t))
+    if (aMessage.Read(aMessage.GetOffset() + sizeof(icmp6Header), sizeof(uint32_t), &timestamp) >=
+        static_cast<int>(sizeof(uint32_t)))
     {
         sServer->OutputFormat(" time=%dms", Timer::GetNow() - HostSwap32(timestamp));
     }
@@ -747,7 +748,9 @@ exit:
 
 void Interpreter::HandlePingTimer(void *aContext)
 {
-    *(uint32_t *)sEchoRequest = HostSwap32(Timer::GetNow());
+    uint32_t timestamp = HostSwap32(Timer::GetNow());
+
+    memcpy(sEchoRequest, &timestamp, sizeof(timestamp));
     sIcmpEcho.SendEchoRequest(sSockAddr, sEchoRequest, sLength);
     sCount--;
 
@@ -1072,7 +1075,7 @@ void Interpreter::ProcessRouter(int argc, char *argv[])
         {
             sServer->OutputFormat("Ext Addr: ");
 
-            for (int j = 0; j < sizeof(routerInfo.mExtAddress); j++)
+            for (size_t j = 0; j < sizeof(routerInfo.mExtAddress); j++)
             {
                 sServer->OutputFormat("%02x", routerInfo.mExtAddress.m8[j]);
             }
diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp
index b30e6f5b0..d4d80a85d 100644
--- a/src/core/mac/mac.cpp
+++ b/src/core/mac/mac.cpp
@@ -741,8 +741,8 @@ ThreadError Mac::ProcessReceiveSecurity(Frame &aFrame, const Address &aSrcAddr,
         ExitNow(error = kThreadError_Security);
     }
 
-    VerifyOrExit(keySequence > aNeighbor->mKeySequence ||
-                 (keySequence == aNeighbor->mKeySequence) && (frameCounter >= aNeighbor->mValid.mLinkFrameCounter),
+    VerifyOrExit((keySequence > aNeighbor->mKeySequence) ||
+                 ((keySequence == aNeighbor->mKeySequence) && (frameCounter >= aNeighbor->mValid.mLinkFrameCounter)),
                  error = kThreadError_Security);
 
     aesCcm.SetKey(macKey, 16);