Fix warning codes in Easysetup
authorParkhi <h_w.park@samsung.com>
Tue, 27 Sep 2016 10:39:03 +0000 (19:39 +0900)
committerUze Choi <uzchoi@samsung.com>
Thu, 29 Sep 2016 07:38:43 +0000 (07:38 +0000)
Change-Id: I98657cf28e67db3956540a7a27eb4a7fc28d79ac
Signed-off-by: Parkhi <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12309
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit 6b311610a9aec78c4da0f5520ed928244719e3ff)
Reviewed-on: https://gerrit.iotivity.org/gerrit/12533

service/easy-setup/enrollee/src/resourcehandler.c
service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp

index 2fcf719..733904b 100755 (executable)
@@ -88,7 +88,7 @@ bool CompareResourceInterface(char *from, char *iface)
             }
         }
 
-    } while (ptr = strtok(NULL, ";"));
+    } while ((ptr = strtok(NULL, ";")));
 
     return false;
 }
index 867c0f8..0bc2d9e 100755 (executable)
@@ -159,7 +159,7 @@ namespace OIC
             else if (pOwnedDevList.size())
             {
                 OIC_LOG_V(DEBUG, ENROLEE_SECURITY_TAG, "Found owned devices. Count =%d",
-                        pOwnedDevList.size());
+                        (int)pOwnedDevList.size());
                 std::shared_ptr< OC::OCSecureResource > ownedDevice =
                     findEnrolleeSecurityResource(pOwnedDevList);
 
@@ -182,7 +182,7 @@ namespace OIC
             else if (pUnownedDevList.size())
             {
                 OIC_LOG_V(DEBUG, ENROLEE_SECURITY_TAG, "Found Unowned devices. Count =%d",
-                        pUnownedDevList.size());
+                        (int)pUnownedDevList.size());
 
                 m_unownedDevice = findEnrolleeSecurityResource(pUnownedDevList);
                 if (m_unownedDevice)
@@ -330,7 +330,7 @@ namespace OIC
             else if (pOwnedDevList.size())
             {
                 OIC_LOG_V(DEBUG, ENROLEE_SECURITY_TAG, "Found owned devices. Count =%d",
-                        pOwnedDevList.size());
+                        (int)pOwnedDevList.size());
                 ownedDevice = findEnrolleeSecurityResource(pOwnedDevList);
 
                 if (!ownedDevice)