Fix bugs for copy provider
authorYounghyunJoo <yh_.joo@samsung.com>
Wed, 31 Aug 2016 08:50:55 +0000 (17:50 +0900)
committerUze Choi <uzchoi@samsung.com>
Thu, 1 Sep 2016 12:33:45 +0000 (12:33 +0000)
- Modify incompatible type casting

Change-Id: Ic2695c85c1b4c6070089d46dbb9179d6cb9baae1
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
service/notification/src/consumer/NSConsumerInterface.c

index 2016a8b..2d56778 100644 (file)
@@ -174,13 +174,14 @@ NSResult NSConsumerGetInterestTopics(NSProvider * provider)
     NS_VERIFY_NOT_NULL(provider, NS_ERROR);
 
     NS_LOG_V(DEBUG, "NSProvider ID: %s", provider->providerId);
-    NSProvider_internal * prov = NSConsumerFindNSProvider(provider->providerId);
-    NS_VERIFY_NOT_NULL(prov, NS_ERROR);
-    NSSelector selector = prov->accessPolicy;
-    NSRemoveProvider_internal(prov);
+    NSProvider_internal * prov_internal = NSConsumerFindNSProvider(provider->providerId);
+    NS_VERIFY_NOT_NULL(prov_internal, NS_ERROR);
+
+    NSSelector selector = prov_internal->accessPolicy;
+    NSRemoveProvider_internal(prov_internal);
     NS_VERIFY_NOT_NULL(selector == NS_SELECTION_CONSUMER ? (void *) 1 : NULL, NS_ERROR);
 
-    prov = (NSProvider *)NSCopyProvider((NSProvider_internal *) provider);
+    NSProvider * prov = (NSProvider *)NSCopyProvider((NSProvider_internal *) provider);
     NS_VERIFY_NOT_NULL(prov, NS_ERROR);
 
     NSTask * topicTask = NSMakeTask(TASK_CONSUMER_GET_TOPIC_LIST, (void *) prov);
@@ -197,14 +198,14 @@ NSResult NSConsumerSelectInterestTopics(NSProvider * provider)
     NS_VERIFY_NOT_NULL(provider, NS_ERROR);
     NS_VERIFY_NOT_NULL(provider->topicLL, NS_ERROR);
 
-    NSProvider_internal * prov = NSConsumerFindNSProvider(provider->providerId);
-    NS_VERIFY_NOT_NULL(prov, NS_ERROR);
+    NSProvider_internal * prov_internal = NSConsumerFindNSProvider(provider->providerId);
+    NS_VERIFY_NOT_NULL(prov_internal, NS_ERROR);
 
-    NSSelector selector = prov->accessPolicy;
-    NSRemoveProvider_internal(prov);
+    NSSelector selector = prov_internal->accessPolicy;
+    NSRemoveProvider_internal(prov_internal);
     NS_VERIFY_NOT_NULL(selector == NS_SELECTION_CONSUMER ? (void *) 1 : NULL, NS_ERROR);
 
-    prov = (NSProvider *)NSCopyProvider((NSProvider_internal *) provider);
+    NSProvider * prov = (NSProvider *)NSCopyProvider((NSProvider_internal *) provider);
     NS_VERIFY_NOT_NULL(prov, NS_ERROR);
 
     NSTask * topicTask = NSMakeTask(TASK_CONSUMER_SELECT_TOPIC_LIST, (void *) prov);