Fix build fail on notification with MQ.
authorKIM JungYong <jyong2.kim@samsung.com>
Tue, 18 Apr 2017 03:59:27 +0000 (12:59 +0900)
committerUze Choi <uzchoi@samsung.com>
Tue, 18 Apr 2017 05:29:24 +0000 (05:29 +0000)
When building of notificaiton with MQ, build failed
because related API call invalid(removed) function.

in this patch, removed function was changed.

Change-Id: Ib97a5c966f4bd8907bfecbfd1463340574c2063c
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19031
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
service/notification/src/consumer/NSConsumerInterface.c
service/notification/src/provider/NSProviderInterface.c

index 8bd7a99..70edd55 100644 (file)
@@ -76,7 +76,7 @@ NSResult NSConsumerSubscribeMQService(const char * serverAddress, const char * t
     bool isStartedConsumer = NSIsStartedConsumer();
     NS_VERIFY_NOT_NULL(isStartedConsumer == true ? (void *) 1 : NULL, NS_ERROR);
 
-    char * queryAddr = NSGetQueryAddress(serverAddress);
+    char * queryAddr = OICStrdup(serverAddress);
     NS_VERIFY_NOT_NULL(queryAddr, NS_ERROR);
 
     NSMQTopicAddress * topicAddr = (NSMQTopicAddress *)OICMalloc(sizeof(NSMQTopicAddress));
index 64290fa..0cd3037 100644 (file)
@@ -216,7 +216,7 @@ NSResult NSProviderSubscribeMQService(const char * serverAddress, const char * t
         return NS_FAIL;
     }
 
-    topicAddr->serverAddr = NSGetQueryAddress(serverAddress);
+    topicAddr->serverAddr = OICStrdup(serverAddress);
     topicAddr->topicName = OICStrdup(topicName);
 
     NS_LOG_V(DEBUG, "input Topic Name : %s", topicAddr->topicName);
@@ -450,7 +450,7 @@ NSResult NSProviderSetConsumerTopic(const char * consumerId, const char * topicN
                 "Configuration must set to true.");
         if (topicSubData)
         {
-            OICFreeAndSetToNull(&topicSubData);
+            OICFreeAndSetToNull((void**)&topicSubData);
         }
         pthread_mutex_unlock(&nsInitMutex);
         return NS_FAIL;
@@ -489,7 +489,7 @@ NSResult NSProviderUnsetConsumerTopic(const char * consumerId, const char * topi
                 "Configuration must set to true.");
         if (topicSubData)
         {
-            OICFreeAndSetToNull(&topicSubData);
+            OICFreeAndSetToNull((void**)&topicSubData);
         }
         pthread_mutex_unlock(&nsInitMutex);
         return NS_FAIL;