Modify related topiclist.

first patch included
1. Rename function and variables related TopicList.
2. Destory TopicList.

second patch inlcuded
remove the white spaces.

third pacth included
remove duplicated initTopiList.

four patch updated commit message only.

Change-Id: Id13c4442546c0659eb4f8c73a4f2a7fc832d330e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index 0c81b2d..3a54b11 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -89,6 +89,7 @@ void NSSetList()
 \r
     NSInitSubscriptionList();\r
     NSInitMessageList();\r
+    NSInitTopicList();\r
     NS_LOG(DEBUG, "NSSetList - OUT");\r
 }\r
 \r
@@ -96,6 +97,7 @@ void NSDestroyList()
 {\r
     NSStorageDestroy(consumerSubList);\r
     NSStorageDestroy(messageList);\r
+    NSStorageDestroy(consumerTopicList);\r
 \r
     pthread_mutex_destroy(&NSCacheMutex);\r
     pthread_mutexattr_destroy(&NSCacheMutexAttr);\r
@@ -261,9 +263,7 @@ NSResult NSProviderRegisterTopics(NSTopicList *topicList)
     NS_LOG(DEBUG, "NSProviderSetTopics - IN");\r
     pthread_mutex_lock(&nsInitMutex);\r
 \r
-    NSInitTopicStorage();\r
-\r
-    NSPushQueue(TOPIC_SCHEDULER, TASK_REGISTER_TOPICS, topicList);\r
+    NSPushQueue(TOPIC_SCHEDULER, TASK_REGISTER_TOPICS, consumerTopicList);\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
     NS_LOG(DEBUG, "NSProviderSetTopics - OUT");\r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index c683240..44c5b65 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -22,7 +22,7 @@
 \r
 static bool isTopicList = false;\r
 \r
-NSResult NSInitTopicStorage()\r
+NSResult NSInitTopicList()\r
 {\r
     NS_LOG(DEBUG, "NSInitTopicList - IN");\r
 \r
@@ -32,8 +32,8 @@ NSResult NSInitTopicStorage()
         return NS_FAIL;\r
     }\r
 \r
-    topicStorage = NSStorageCreate();\r
-    topicStorage->cacheType = NS_PROVIDER_CACHE_TOPIC;\r
+    consumerTopicList = NSStorageCreate();\r
+    consumerTopicList->cacheType = NS_PROVIDER_CACHE_TOPIC;\r
     isTopicList = true;\r
 \r
     NS_LOG(DEBUG, "NSInitTopicList - OUT");\r
@@ -77,7 +77,7 @@ NSResult NSStoreTopics(char * consumerId, NSTopic** topics)
     element->data = (void*) topicData;\r
     element->next = NULL;\r
 \r
-    if(NSStorageWrite(topicStorage, element) != NS_OK)\r
+    if(NSStorageWrite(consumerTopicList, element) != NS_OK)\r
     {\r
         NS_LOG(DEBUG, "fail to write cache");\r
     }\r

diff --git a/service/notification/src/provider/NSProviderTopic.h b/service/notification/src/provider/NSProviderTopic.h
index 0f9b6b1..5f65e74 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.h
+++ b/service/notification/src/provider/NSProviderTopic.h
@@ -28,9 +28,9 @@
 #include "NSProviderResource.h"\r
 #include "NSProviderSubscription.h"\r
 \r
-NSCacheList * topicStorage;\r
+NSCacheList * consumerTopicList;\r
 \r
-NSResult NSInitTopicStorage();\r
+NSResult NSInitTopicList();\r
 NSTopicList * NSGetTopics(char *consumerId);\r
 \r
 bool NSIsTopicSubscribed(char *consumerId, char *topic);\r