replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / notification / src / provider / NSProviderCallbackResponse.c

diff --git a/service/notification/src/provider/NSProviderCallbackResponse.c b/service/notification/src/provider/NSProviderCallbackResponse.c
index a09f678..e702bab 100644 (file)
--- a/service/notification/src/provider/NSProviderCallbackResponse.c
+++ b/service/notification/src/provider/NSProviderCallbackResponse.c
@@ -23,7 +23,6 @@
 #include "NSProviderListener.h"\r
 #include "NSProviderSubscription.h"\r
 #include "NSProviderNotification.h"\r
-#include "NSStorageAdapter.h"\r
 #include "NSProviderMemoryCache.h"\r
 #include "NSProviderCallbackResponse.h"\r
 #include "oic_malloc.h"\r
@@ -44,7 +43,7 @@ void NSRegisterSubscribeRequestCb(NSSubscribeRequestCallback subscribeRequestCb)
     NS_LOG(DEBUG, "NSRegisterSubscribeRequestCb - OUT");\r
 }\r
 \r
-void  NSRegisterSyncCb(NSProviderSyncInfoCallback syncCb)\r
+void NSRegisterSyncCb(NSProviderSyncInfoCallback syncCb)\r
 {\r
     NS_LOG(DEBUG, "NSRegisterSyncCb - IN");\r
     g_syncCb = syncCb;\r
@@ -91,15 +90,16 @@ void * NSCallbackResponseSchedule(void * ptr)
                     OCEntityHandlerRequest * request = (OCEntityHandlerRequest*)node->taskData;\r
                     NSConsumer * consumer = (NSConsumer *)OICMalloc(sizeof(NSConsumer));\r
 \r
-                    char * consumerId = NSGetValueFromQuery(OICStrdup(request->query),\r
-                            NS_QUERY_CONSUMER_ID);\r
+                    char * copyQuery = OICStrdup(request->query);\r
+                    char * consumerId = NSGetValueFromQuery(copyQuery, NS_QUERY_CONSUMER_ID);\r
 \r
-                    if(consumerId)\r
+                    if (consumerId)\r
                     {\r
                         OICStrcpy(consumer->consumerId, UUID_STRING_SIZE, consumerId);\r
                         NSSubscribeRequestCb(consumer);\r
                     }\r
 \r
+                    NSOICFree(copyQuery);\r
                     NSFreeConsumer(consumer);\r
                     NSFreeOCEntityHandlerRequest(request);\r
 \r
@@ -117,7 +117,7 @@ void * NSCallbackResponseSchedule(void * ptr)
                     NS_LOG(DEBUG, "No Task Type");\r
                     break;\r
             }\r
-            OICFree(node);\r
+            NSOICFree(node);\r
         }\r
 \r
         pthread_mutex_unlock(&NSMutex[CALLBACK_RESPONSE_SCHEDULER]);\r