Fix for result of static analysis.

Pointer value casting is fixed for valid size.
If statement is fixed.

Change-Id: I4e6304769c683f78caca8eea4f4dc1da5c369a59
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11619
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>

diff --git a/service/notification/src/consumer/NSConsumerDiscovery.c b/service/notification/src/consumer/NSConsumerDiscovery.c
index 98951b34fc6a3774ac0e292f8264fdb9f6e14c59..44c6a1962cf13008921e654ab44b80f2c3da4f0f 100644 (file)
--- a/service/notification/src/consumer/NSConsumerDiscovery.c
+++ b/service/notification/src/consumer/NSConsumerDiscovery.c
@@ -211,7 +211,7 @@ NSProvider_internal * NSGetProvider(OCClientResponse * clientResponse)
     char * syncUri = NULL;
     char * topicUri = NULL;
     bool bAccepter = 0;
-    int16_t iAccepter = 0;
+    int64_t iAccepter = 0;
     NSProviderConnectionInfo * connection = NULL;
 
     NS_LOG(DEBUG, "get information of accepter");
@@ -222,7 +222,7 @@ NSProvider_internal * NSGetProvider(OCClientResponse * clientResponse)
     }
     else if (accepterType == OCREP_PROP_INT)
     {
-        getResult = OCRepPayloadGetPropInt(payload, NS_ATTRIBUTE_POLICY, (int64_t*) & iAccepter);
+        getResult = OCRepPayloadGetPropInt(payload, NS_ATTRIBUTE_POLICY, & iAccepter);
     }
     NS_VERIFY_NOT_NULL(getResult == true ? (void *) 1 : NULL, NULL);
 

diff --git a/service/notification/unittest/NSProviderSimulator.h b/service/notification/unittest/NSProviderSimulator.h
index bdc44e39cc4ca4a49fd9998efc2dfe791b7ab55e..953e58d142360117d9dae7034eb7ffe3cda8c130 100644 (file)
--- a/service/notification/unittest/NSProviderSimulator.h
+++ b/service/notification/unittest/NSProviderSimulator.h
@@ -176,7 +176,7 @@ private:
                 return response;
             }
 
-            else if (request == "POST" && type == requestType::NS_SYNC)
+            else if (request == "POST")
             {
                 if (type == requestType::NS_SYNC)
                 {