Revert "[CONPRO-1337] Disabled Presence Feature"

[platform/upstream/iotivity.git] / service / notification / src / consumer / NSConsumerQueue.c

diff --git a/service/notification/src/consumer/NSConsumerQueue.c b/service/notification/src/consumer/NSConsumerQueue.c
index 1294079..89495e7 100644 (file)
--- a/service/notification/src/consumer/NSConsumerQueue.c
+++ b/service/notification/src/consumer/NSConsumerQueue.c
@@ -43,17 +43,14 @@ void NSDestroyQueue(NSConsumerQueue * queue)
     NSConsumerQueueObject * node = NSPopQueue(queue);
     while(node)
     {
-        NSConsumerQueueObject * next = (NSConsumerQueueObject *)node->next;
         NSOICFree(node->data);
         NSOICFree(node);
 
-        node = next;
+        node = NSPopQueue(queue);
     }
-
-    NSOICFree(queue);
 }
 
-bool NSPushQueue(NSConsumerQueue * queue, NSConsumerQueueObject * object)
+bool NSPushConsumerQueue(NSConsumerQueue * queue, NSConsumerQueueObject * object)
 {
     NS_VERIFY_NOT_NULL(queue, false);
     NS_VERIFY_NOT_NULL(object, false);