[IoT-1574] Rename callback function of related MQ.

this patch include,
rename callback function only.
NSProviderPublishTopicCB  --> NSProviderPublishMQResponseCB
NSProviderIntrospectMQTopic --> NSProviderGetMQResponseCB

Change-Id: Iddfddae93fcb8348cb7beb0250a8c6a01dae7fa5
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/14501
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c
index c3b4667..7ebb7a1 100644 (file)
--- a/service/notification/src/provider/NSProviderListener.c
+++ b/service/notification/src/provider/NSProviderListener.c
@@ -396,10 +396,10 @@ OCStackApplicationResult NSProviderMQListener(void * ctx, OCDoHandle handle,
     return OC_STACK_KEEP_TRANSACTION;\r
 }\r
 \r
-OCStackApplicationResult NSProviderIntrospectMQTopic(void * ctx, OCDoHandle handle,\r
+OCStackApplicationResult NSProviderGetMQResponseCB(void * ctx, OCDoHandle handle,\r
         OCClientResponse * clientResponse)\r
 {\r
-    NS_LOG(DEBUG, "NSProviderIntrospectMQTopic - IN");\r
+    NS_LOG(DEBUG, "NSProviderGetMQResponseCB - IN");\r
 \r
     (void) handle;\r
 \r
@@ -450,11 +450,11 @@ OCStackApplicationResult NSProviderIntrospectMQTopic(void * ctx, OCDoHandle hand
         }\r
     }\r
 \r
-    NS_LOG(DEBUG, "NSProviderIntrospectMQTopic - OUT");\r
+    NS_LOG(DEBUG, "NSProviderGetMQResponseCB - OUT");\r
     return OC_STACK_KEEP_TRANSACTION;\r
 }\r
 \r
-OCStackApplicationResult NSProviderPublishTopicCB(void *ctx, OCDoHandle handle,\r
+OCStackApplicationResult NSProviderPublishMQResponseCB(void *ctx, OCDoHandle handle,\r
         OCClientResponse *clientResponse)\r
 {\r
     (void) ctx;\r

diff --git a/service/notification/src/provider/NSProviderListener.h b/service/notification/src/provider/NSProviderListener.h
index ea4a48c..0e0d791 100644 (file)
--- a/service/notification/src/provider/NSProviderListener.h
+++ b/service/notification/src/provider/NSProviderListener.h
@@ -52,10 +52,10 @@ void NSProviderConnectionStateListener(const CAEndpoint_t * info, bool isConnect
 void NSProviderAdapterStateListener(CATransportAdapter_t adapter, bool enabled);\r
 \r
 #ifdef WITH_MQ\r
-OCStackApplicationResult NSProviderIntrospectMQTopic(void * ctx, OCDoHandle handle,\r
+OCStackApplicationResult NSProviderGetMQResponseCB(void * ctx, OCDoHandle handle,\r
         OCClientResponse * clientResponse);\r
 \r
-OCStackApplicationResult NSProviderPublishTopicCB(void *ctx, OCDoHandle handle,\r
+OCStackApplicationResult NSProviderPublishMQResponseCB(void *ctx, OCDoHandle handle,\r
         OCClientResponse *clientResponse);\r
 #endif\r
 \r

diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c
index affc533..d8d81c4 100644 (file)
--- a/service/notification/src/provider/NSProviderNotification.c
+++ b/service/notification/src/provider/NSProviderNotification.c
@@ -138,7 +138,7 @@ NSResult NSSendNotification(NSMessage *msg)
 #ifdef WITH_MQ
     if (NSGetMQServerInfo())
     {
-        NSProviderPublishTopic(payload, NSProviderPublishTopicCB);
+        NSProviderPublishTopic(payload, NSProviderPublishMQResponseCB);
     }
 #endif
 

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 423491e..d2563ce 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -356,7 +356,7 @@ void NSProviderMQSubscription(NSMQTopicAddress * topicAddr)
 \r
     OCDevAddr * addr = NSChangeAddress(serverUri);\r
     OCCallbackData cbdata = { NULL, NULL, NULL };\r
-    cbdata.cb = NSProviderIntrospectMQTopic;\r
+    cbdata.cb = NSProviderGetMQResponseCB;\r
     cbdata.context = OICStrdup(topicName);\r
     cbdata.cd = OICFree;\r
 \r