From f4c40f4c8a3a467364b9d68353e7ed51bdf7494c Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@nestlabs.com>
Date: Mon, 17 Apr 2017 18:02:23 -0700
Subject: [PATCH] Fix compiler warning and code style. (#1605)

---
 .travis/script.sh    |  2 +-
 src/cli/cli_coap.cpp | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.travis/script.sh b/.travis/script.sh
index 794838411..c109a8bcb 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -37,7 +37,7 @@ set -x
 [ $BUILD_TARGET != pretty-check ] || {
     export PATH=/tmp/astyle/build/gcc/bin:$PATH || die
     ./bootstrap || die
-    ./configure --enable-ftd --enable-cli --enable-diag --enable-dhcp6-client --enable-dhcp6-server --enable-dns-client --enable-commissioner --enable-joiner --with-examples=posix || die
+    ./configure --enable-ftd --enable-cli --enable-diag --enable-dhcp6-client --enable-dhcp6-server --enable-dns-client --enable-commissioner --enable-joiner --enable-application-coap --with-examples=posix || die
     make pretty-check || die
 }
 
diff --git a/src/cli/cli_coap.cpp b/src/cli/cli_coap.cpp
index 8ab04686c..3c118aa26 100644
--- a/src/cli/cli_coap.cpp
+++ b/src/cli/cli_coap.cpp
@@ -72,15 +72,17 @@ void Coap::PrintPayload(otMessage *aMessage)
             bytesPrinted += bytesToPrint;
         }
     }
+
     sServer->OutputFormat("\r\n");
 }
 
 void Coap::ConvertToLower(char *aString)
 {
     uint8_t i = 0;
+
     while (aString[i])
     {
-        aString[i] = tolower(aString[i]);
+        aString[i] = (char)tolower(aString[i]);
         i++;
     }
 }
@@ -104,6 +106,7 @@ ThreadError Coap::Process(otInstance *aInstance, int argc, char *argv[], Server
     sResource.mHandler = (otCoapRequestHandler) &Coap::s_HandleServerResponse;
 
     VerifyOrExit(argc > 0, error = kThreadError_InvalidArgs);
+
     for (unsigned int i = 0; i < sizeof(sCommands) / sizeof(sCommands[0]); i++)
     {
         if (strcmp(argv[0], sCommands[i].mName) == 0)
@@ -124,6 +127,7 @@ ThreadError Coap::ProcessServer(int argc, char *argv[])
     VerifyOrExit(argc > 0, error = kThreadError_InvalidArgs);
 
     ConvertToLower(argv[0]);
+
     if (strcmp(argv[0], "start") == 0)
     {
         SuccessOrExit(error = otCoapServerStart(sInstance));
@@ -270,6 +274,7 @@ ThreadError Coap::ProcessClient(int argc, char *argv[])
 
     // CoAP-Code
     ConvertToLower(argv[0]);
+
     if (strcmp(argv[0], "get") == 0)
     {
         coapCode = kCoapRequestGet;
@@ -313,6 +318,7 @@ ThreadError Coap::ProcessClient(int argc, char *argv[])
 
     // CoAP-Type
     ConvertToLower(argv[3]);
+
     if ((argc > 3) && (strcmp(argv[3], "con") == 0))
     {
         coapType = kCoapTypeConfirmable;
@@ -339,21 +345,23 @@ ThreadError Coap::ProcessClient(int argc, char *argv[])
 
     if ((coapType == kCoapTypeConfirmable) || coapCode == kCoapRequestGet)
     {
-    	error = otCoapSendRequest(sInstance, message, &messageInfo,
-    	                              (otCoapResponseHandler) &Coap::s_HandleClientResponse, NULL);
+        error = otCoapSendRequest(sInstance, message, &messageInfo,
+                                  (otCoapResponseHandler) &Coap::s_HandleClientResponse, NULL);
     }
     else
     {
-    	error = otCoapSendRequest(sInstance, message, &messageInfo, NULL, NULL);
+        error = otCoapSendRequest(sInstance, message, &messageInfo, NULL, NULL);
     }
 
     sServer->OutputFormat("Sending CoAP message: ");
 
 exit:
+
     if ((error != kThreadError_None) && (message != NULL))
     {
         otMessageFree(message);
     }
+
     return error;
 }