Delete NSStorageAdapter header file.

NSStorageAdapter.h file is used by both of provider and consumer.
For the above reason, when import both library, app will crash or build fail.
So in this patch,
NSStorageAdapter.h file is deleted, and related function was renamed.

Change-Id: Iaa243334e644014ea16eefd7338e90b112c0b633
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12535
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/src/common/NSStorageAdapter.h b/service/notification/src/common/NSStorageAdapter.h
deleted file mode 100644 (file)
index 27aff40..0000000
--- a/service/notification/src/common/NSStorageAdapter.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//******************************************************************\r
-//\r
-// Copyright 2016 Samsung Electronics All Rights Reserved.\r
-//\r
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-//\r
-// Licensed under the Apache License, Version 2.0 (the "License");\r
-// you may not use this file except in compliance with the License.\r
-// You may obtain a copy of the License at\r
-//\r
-//      http://www.apache.org/licenses/LICENSE-2.0\r
-//\r
-// Unless required by applicable law or agreed to in writing, software\r
-// distributed under the License is distributed on an "AS IS" BASIS,\r
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-// See the License for the specific language governing permissions and\r
-// limitations under the License.\r
-//\r
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
-\r
-#ifndef _NS_STORAGEADAPTER__H_\r
-#define _NS_STORAGEADAPTER__H_\r
-\r
-#include "logger.h"\r
-#include <octypes.h>\r
-#include <stdbool.h>\r
-#include "ocstack.h"\r
-#include "ocpayload.h"\r
-#include "NSStructs.h"\r
-#include "NSConstants.h"\r
-\r
-NSCacheList * NSStorageCreate();\r
-NSCacheElement * NSStorageRead(NSCacheList * list, const char * findId);\r
-NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj);\r
-NSResult NSStorageDelete(NSCacheList * list, const char * delId);\r
-NSResult NSStorageDestroy(NSCacheList * list);\r
-\r
-#endif /* _NS_STORAGEADAPTER__H_ */\r

diff --git a/service/notification/src/consumer/NSConsumerInternalTaskController.c b/service/notification/src/consumer/NSConsumerInternalTaskController.c
index b069742..0775637 100644 (file)
--- a/service/notification/src/consumer/NSConsumerInternalTaskController.c
+++ b/service/notification/src/consumer/NSConsumerInternalTaskController.c
@@ -73,7 +73,7 @@ void NSDestroyInternalCachedList()
     NSCacheList * cache = *(NSGetProviderCacheList());
     if (cache)
     {
-        NSStorageDestroy(cache);
+        NSConsumerStorageDestroy(cache);
     }
 
     NSSetProviderCacheList(NULL);
@@ -91,14 +91,14 @@ NSProvider_internal * NSProviderCacheFind(const char * providerId)
     if (!ProviderCache)
     {
         NS_LOG(DEBUG, "Provider Cache Init");
-        ProviderCache = NSStorageCreate();
+        ProviderCache = NSConsumerStorageCreate();
         NS_VERIFY_NOT_NULL(ProviderCache, NULL);
 
         ProviderCache->cacheType = NS_CONSUMER_CACHE_PROVIDER;
         NSSetProviderCacheList(ProviderCache);
     }
 
-    NSCacheElement * cacheElement = NSStorageRead(ProviderCache, providerId);
+    NSCacheElement * cacheElement = NSConsumerStorageRead(ProviderCache, providerId);
     NS_VERIFY_NOT_NULL(cacheElement, NULL);
 
     return NSCopyProvider_internal((NSProvider_internal *) cacheElement->data);
@@ -129,7 +129,7 @@ NSResult NSProviderCacheUpdate(NSProvider_internal * provider)
     if (!ProviderCache)
     {
         NS_LOG(DEBUG, "Provider Cache Init");
-        ProviderCache = NSStorageCreate();
+        ProviderCache = NSConsumerStorageCreate();
         NS_VERIFY_NOT_NULL(ProviderCache, NS_ERROR);
 
         ProviderCache->cacheType = NS_CONSUMER_CACHE_PROVIDER;
@@ -145,7 +145,7 @@ NSResult NSProviderCacheUpdate(NSProvider_internal * provider)
     obj->next = NULL;
 
     NS_LOG(DEBUG, "try to write to storage");
-    NSResult ret = NSStorageWrite(ProviderCache, obj);
+    NSResult ret = NSConsumerStorageWrite(ProviderCache, obj);
     NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(ret == NS_OK ? (void *) 1 : NULL,
             NS_ERROR, NSOICFree(obj));
 
@@ -158,7 +158,7 @@ void NSCancelAllSubscription()
     if (!ProviderCache)
     {
         NS_LOG(DEBUG, "Provider Cache Init");
-        ProviderCache = NSStorageCreate();
+        ProviderCache = NSConsumerStorageCreate();
         NS_VERIFY_NOT_NULL_V(ProviderCache);
 
         ProviderCache->cacheType = NS_CONSUMER_CACHE_PROVIDER;
@@ -278,7 +278,7 @@ void NSConsumerHandleProviderDeleted(NSProvider_internal * provider)
     NSCacheList * providerCache = *(NSGetProviderCacheList());
     NS_VERIFY_NOT_NULL_V(providerCache);
 
-    NSResult ret = NSStorageDelete(providerCache, provider->providerId);
+    NSResult ret = NSConsumerStorageDelete(providerCache, provider->providerId);
     NS_VERIFY_NOT_NULL_V(ret == NS_OK ? (void *)1 : NULL);
 
     NS_LOG_V(DEBUG, "Stopped Provider : %s", provider->providerId);
@@ -292,7 +292,7 @@ void NSConsumerHandleSubscribeSucceed(NSProvider_internal * provider)
 
     NSCacheList * ProviderCache = *(NSGetProviderCacheList());
 
-    NSCacheElement * cacheElement = NSStorageRead(ProviderCache, provider->providerId);
+    NSCacheElement * cacheElement = NSConsumerStorageRead(ProviderCache, provider->providerId);
     NS_VERIFY_NOT_NULL_V(cacheElement);
 
     pthread_mutex_t * mutex = NSGetCacheMutex();
@@ -318,7 +318,7 @@ void NSConsumerHandleRecvProviderChanged(NSMessage * msg)
 
     NSCacheList * ProviderCache = *(NSGetProviderCacheList());
 
-    NSCacheElement * cacheElement = NSStorageRead(ProviderCache, msg->providerId);
+    NSCacheElement * cacheElement = NSConsumerStorageRead(ProviderCache, msg->providerId);
     NS_VERIFY_NOT_NULL_V(cacheElement);
 
     pthread_mutex_t * mutex = NSGetCacheMutex();

diff --git a/service/notification/src/consumer/NSConsumerInternalTaskController.h b/service/notification/src/consumer/NSConsumerInternalTaskController.h
index b12265b..4d567e5 100644 (file)
--- a/service/notification/src/consumer/NSConsumerInternalTaskController.h
+++ b/service/notification/src/consumer/NSConsumerInternalTaskController.h
@@ -26,7 +26,6 @@ extern "C" {
 #endif // __cplusplus
 
 #include "NSStructs.h"
-#include "NSStorageAdapter.h"
 #include "NSConsumerMemoryCache.h"
 #include "NSConsumerCommunication.h"
 

diff --git a/service/notification/src/consumer/NSConsumerMemoryCache.c b/service/notification/src/consumer/NSConsumerMemoryCache.c
index f06f918..5984beb 100644 (file)
--- a/service/notification/src/consumer/NSConsumerMemoryCache.c
+++ b/service/notification/src/consumer/NSConsumerMemoryCache.c
@@ -35,7 +35,7 @@ pthread_mutex_t * NSGetCacheMutex()
     return g_NSCacheMutex;
 }
 
-NSCacheList * NSStorageCreate()
+NSCacheList * NSConsumerStorageCreate()
 {
     pthread_mutex_t * mutex = NSGetCacheMutex();
     pthread_mutex_lock(mutex);
@@ -51,7 +51,7 @@ NSCacheList * NSStorageCreate()
     return newList;
 }
 
-NSCacheElement * NSStorageRead(NSCacheList * list, const char * findId)
+NSCacheElement * NSConsumerStorageRead(NSCacheList * list, const char * findId)
 {
     NS_VERIFY_NOT_NULL(list, NULL);
     NS_VERIFY_NOT_NULL(findId, NULL);
@@ -115,7 +115,7 @@ NSCacheElement * NSGetProviderFromAddr(NSCacheList * list, const char * addr, ui
     return NULL;
 }
 
-NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)
+NSResult NSConsumerStorageWrite(NSCacheList * list, NSCacheElement * newObj)
 {
     NS_VERIFY_NOT_NULL(list, NS_ERROR);
     NS_VERIFY_NOT_NULL(newObj, NS_ERROR);
@@ -133,7 +133,7 @@ NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)
     return NS_ERROR;
 }
 
-NSResult NSStorageDelete(NSCacheList * list, const char * delId)
+NSResult NSConsumerStorageDelete(NSCacheList * list, const char * delId)
 {
     NS_VERIFY_NOT_NULL(list, NS_ERROR);
     NS_VERIFY_NOT_NULL(delId, NS_ERROR);
@@ -207,7 +207,7 @@ NSResult NSConsumerCacheWriteProvider(NSCacheList * list, NSCacheElement * newOb
 
     NSProvider_internal * newProvObj = (NSProvider_internal *) newObj->data;
 
-    NSCacheElement * it = NSStorageRead(list, newProvObj->providerId);
+    NSCacheElement * it = NSConsumerStorageRead(list, newProvObj->providerId);
 
     pthread_mutex_lock(mutex);
 
@@ -296,7 +296,7 @@ NSCacheElement * NSPopProviderCacheList(NSCacheList * list)
 }
 
 
-NSResult NSStorageDestroy(NSCacheList * list)
+NSResult NSConsumerStorageDestroy(NSCacheList * list)
 {
     NS_VERIFY_NOT_NULL(list, NS_ERROR);
 

diff --git a/service/notification/src/consumer/NSConsumerMemoryCache.h b/service/notification/src/consumer/NSConsumerMemoryCache.h
index 8d6a608..fc7aaaf 100644 (file)
--- a/service/notification/src/consumer/NSConsumerMemoryCache.h
+++ b/service/notification/src/consumer/NSConsumerMemoryCache.h
@@ -28,9 +28,14 @@ extern "C" {
 #include <stdlib.h>
 #include <stdbool.h>
 #include <pthread.h>
-#include "NSStorageAdapter.h"
 #include "NSConsumerCommon.h"
 
+NSCacheList * NSConsumerStorageCreate();
+NSCacheElement * NSConsumerStorageRead(NSCacheList * list, const char * findId);
+NSResult NSConsumerStorageWrite(NSCacheList * list, NSCacheElement * newObj);
+NSResult NSConsumerStorageDelete(NSCacheList * list, const char * delId);
+NSResult NSConsumerStorageDestroy(NSCacheList * list);
+
 pthread_mutex_t * NSGetCacheMutex();
 
 bool NSConsumerCompareIdCacheData(NSCacheType type, void * data, const char * id);

diff --git a/service/notification/src/consumer/NSConsumerQueue.c b/service/notification/src/consumer/NSConsumerQueue.c
index 1294079..59012d7 100644 (file)
--- a/service/notification/src/consumer/NSConsumerQueue.c
+++ b/service/notification/src/consumer/NSConsumerQueue.c
@@ -53,7 +53,7 @@ void NSDestroyQueue(NSConsumerQueue * 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);

diff --git a/service/notification/src/consumer/NSConsumerQueue.h b/service/notification/src/consumer/NSConsumerQueue.h
index 55c9223..4e23761 100644 (file)
--- a/service/notification/src/consumer/NSConsumerQueue.h
+++ b/service/notification/src/consumer/NSConsumerQueue.h
@@ -44,7 +44,7 @@ NSConsumerQueue * NSCreateQueue();
 
 void NSDestroyQueue(NSConsumerQueue *);
 
-bool NSPushQueue(NSConsumerQueue *, NSConsumerQueueObject *);
+bool NSPushConsumerQueue(NSConsumerQueue *, NSConsumerQueueObject *);
 
 NSConsumerQueueObject * NSPopQueue(NSConsumerQueue *);
 

diff --git a/service/notification/src/consumer/NSConsumerScheduler.c b/service/notification/src/consumer/NSConsumerScheduler.c
index ff1540b..f5b440f 100644 (file)
--- a/service/notification/src/consumer/NSConsumerScheduler.c
+++ b/service/notification/src/consumer/NSConsumerScheduler.c
@@ -205,7 +205,7 @@ void * NSConsumerMsgPushThreadFunc(void * data)
     }
     else
     {
-        NSPushQueue(queue, obj);
+        NSPushConsumerQueue(queue, obj);
     }
 
     NSThreadUnlock(msgHandleThread);

diff --git a/service/notification/src/provider/NSProviderCallbackResponse.c b/service/notification/src/provider/NSProviderCallbackResponse.c
index 93d9ab2..a450959 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

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index eedb6a8..ea574a9 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -24,7 +24,6 @@
 #include "NSProviderSubscription.h"
 #include "NSProviderNotification.h"
 #include "NSProviderCallbackResponse.h"
-#include "NSStorageAdapter.h"
 #include "NSProviderMemoryCache.h"
 #include "NSProviderTopic.h"
 #include "oic_malloc.h"
@@ -61,9 +60,9 @@ void NSInitialize()
 
 void NSDeinitailize()
 {
-    NSStorageDestroy(consumerSubList);
-    NSStorageDestroy(consumerTopicList);
-    NSStorageDestroy(registeredTopicList);
+    NSProviderStorageDestroy(consumerSubList);
+    NSProviderStorageDestroy(consumerTopicList);
+    NSProviderStorageDestroy(registeredTopicList);
 
     pthread_mutex_destroy(&NSCacheMutex);
     pthread_mutexattr_destroy(&NSCacheMutexAttr);

diff --git a/service/notification/src/provider/NSProviderListener.h b/service/notification/src/provider/NSProviderListener.h
index 0c55045..e8b8617 100644 (file)
--- a/service/notification/src/provider/NSProviderListener.h
+++ b/service/notification/src/provider/NSProviderListener.h
@@ -33,7 +33,7 @@
 #include "oic_string.h"\r
 #include "oic_malloc.h"\r
 #include "NSUtil.h"\r
-#include "NSStorageAdapter.h"\r
+#include "NSProviderMemoryCache.h"\r
 \r
 OCEntityHandlerResult NSEntityHandlerNotificationCb(OCEntityHandlerFlag flag,\r
         OCEntityHandlerRequest *entityHandlerRequest, void* callback);\r

diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c
index 96674ee..36173de 100644 (file)
--- a/service/notification/src/provider/NSProviderMemoryCache.c
+++ b/service/notification/src/provider/NSProviderMemoryCache.c
@@ -21,7 +21,7 @@
 #include "NSProviderMemoryCache.h"\r
 #include <string.h>\r
 \r
-NSCacheList * NSStorageCreate()\r
+NSCacheList * NSProviderStorageCreate()\r
 {\r
     pthread_mutex_lock(&NSCacheMutex);\r
     NSCacheList * newList = (NSCacheList *) OICMalloc(sizeof(NSCacheList));\r
@@ -39,7 +39,7 @@ NSCacheList * NSStorageCreate()
     return newList;\r
 }\r
 \r
-NSCacheElement * NSStorageRead(NSCacheList * list, const char * findId)\r
+NSCacheElement * NSProviderStorageRead(NSCacheList * list, const char * findId)\r
 {\r
     pthread_mutex_lock(&NSCacheMutex);\r
 \r
@@ -85,7 +85,7 @@ NSResult NSCacheUpdateSubScriptionState(NSCacheList * list, char * id, bool stat
         return NS_ERROR;\r
     }\r
 \r
-    NSCacheElement * it = NSStorageRead(list, id);\r
+    NSCacheElement * it = NSProviderStorageRead(list, id);\r
 \r
     if (it)\r
     {\r
@@ -120,7 +120,7 @@ NSResult NSCacheUpdateSubScriptionState(NSCacheList * list, char * id, bool stat
     return NS_ERROR;\r
 }\r
 \r
-NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)\r
+NSResult NSProviderStorageWrite(NSCacheList * list, NSCacheElement * newObj)\r
 {\r
     pthread_mutex_lock(&NSCacheMutex);\r
 \r
@@ -140,7 +140,7 @@ NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)
         NS_LOG(DEBUG, "Type is SUBSCRIBER");\r
 \r
         NSCacheSubData * subData = (NSCacheSubData *) newObj->data;\r
-        NSCacheElement * it = NSStorageRead(list, subData->id);\r
+        NSCacheElement * it = NSProviderStorageRead(list, subData->id);\r
 \r
         if (it)\r
         {\r
@@ -198,7 +198,7 @@ NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)
         NS_LOG(DEBUG, "Type is REGITSTER TOPIC");\r
 \r
         NSCacheTopicData * topicData = (NSCacheTopicData *) newObj->data;\r
-        NSCacheElement * it = NSStorageRead(list, topicData->topicName);\r
+        NSCacheElement * it = NSProviderStorageRead(list, topicData->topicName);\r
 \r
         if (it)\r
         {\r
@@ -214,7 +214,7 @@ NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)
         NS_LOG(DEBUG, "Type is REGITSTER TOPIC");\r
 \r
         NSCacheTopicSubData * topicData = (NSCacheTopicSubData *) newObj->data;\r
-        NSCacheElement * it = NSStorageRead(list, topicData->topicName);\r
+        NSCacheElement * it = NSProviderStorageRead(list, topicData->topicName);\r
 \r
         if (it)\r
         {\r
@@ -230,7 +230,7 @@ NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)
         NS_LOG(DEBUG, "Type is REGITSTER TOPIC");\r
 \r
         NSCacheTopicSubData * topicData = (NSCacheTopicSubData *) newObj->data;\r
-        NSCacheElement * it = NSStorageRead(list, topicData->id);\r
+        NSCacheElement * it = NSProviderStorageRead(list, topicData->id);\r
 \r
         if (it)\r
         {\r
@@ -256,7 +256,7 @@ NSResult NSStorageWrite(NSCacheList * list, NSCacheElement * newObj)
     return NS_OK;\r
 }\r
 \r
-NSResult NSStorageDestroy(NSCacheList * list)\r
+NSResult NSProviderStorageDestroy(NSCacheList * list)\r
 {\r
     NSCacheElement * iter = list->head;\r
     NSCacheElement * next = NULL;\r
@@ -414,7 +414,7 @@ NSResult NSProviderDeleteCacheData(NSCacheType type, void * data)
     return NS_OK;\r
 }\r
 \r
-NSResult NSStorageDelete(NSCacheList * list, const char * delId)\r
+NSResult NSProviderStorageDelete(NSCacheList * list, const char * delId)\r
 {\r
     pthread_mutex_lock(&NSCacheMutex);\r
     NSCacheElement * prev = list->head;\r

diff --git a/service/notification/src/provider/NSProviderMemoryCache.h b/service/notification/src/provider/NSProviderMemoryCache.h
index 8f209fc..df2733d 100644 (file)
--- a/service/notification/src/provider/NSProviderMemoryCache.h
+++ b/service/notification/src/provider/NSProviderMemoryCache.h
@@ -29,9 +29,14 @@
 #include "NSStructs.h"\r
 #include "oic_malloc.h"\r
 #include "oic_string.h"\r
-#include "NSStorageAdapter.h"\r
 #include "NSUtil.h"\r
 \r
+NSCacheList * NSProviderStorageCreate();\r
+NSCacheElement * NSProviderStorageRead(NSCacheList * list, const char * findId);\r
+NSResult NSProviderStorageWrite(NSCacheList * list, NSCacheElement * newObj);\r
+NSResult NSProviderStorageDelete(NSCacheList * list, const char * delId);\r
+NSResult NSProviderStorageDestroy(NSCacheList * list);\r
+\r
 NSResult NSProviderDeleteCacheData(NSCacheType, void *);\r
 \r
 bool NSProviderCompareIdCacheData(NSCacheType, void *, const char *);\r

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 88198e2..55ba1d5 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -24,7 +24,7 @@ NSResult NSInitSubscriptionList()
 {\r
     NS_LOG(DEBUG, "NSInitSubscriptionList - IN");\r
 \r
-    consumerSubList = NSStorageCreate();\r
+    consumerSubList = NSProviderStorageCreate();\r
     NS_VERIFY_NOT_NULL(consumerSubList, NS_FAIL);\r
     consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER;\r
 \r
@@ -160,7 +160,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         element->data = (void*) subData;\r
         element->next = NULL;\r
 \r
-        if (NSStorageWrite(consumerSubList, element) != NS_OK)\r
+        if (NSProviderStorageWrite(consumerSubList, element) != NS_OK)\r
         {\r
             NS_LOG(DEBUG, "fail to write cache");\r
         }\r
@@ -216,7 +216,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         element->data = (void*) subData;\r
         element->next = NULL;\r
 \r
-        if (NSStorageWrite(consumerSubList, element) != NS_OK)\r
+        if (NSProviderStorageWrite(consumerSubList, element) != NS_OK)\r
         {\r
             NS_LOG(ERROR, "Fail to write cache");\r
         }\r
@@ -233,7 +233,7 @@ void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest)
 \r
     consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER_OBSERVE_ID;\r
 \r
-    while(NSStorageDelete(consumerSubList, (char *)\r
+    while(NSProviderStorageDelete(consumerSubList, (char *)\r
             &(entityHandlerRequest->obsInfo.obsId)) != NS_FAIL);\r
     consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER;\r
 \r
@@ -274,7 +274,7 @@ NSResult NSSendResponse(const char * id, bool accepted)
         : OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_MESSAGE_ID, NS_DENY);\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, NSGetProviderInfo()->providerId);\r
 \r
-    NSCacheElement * element = NSStorageRead(consumerSubList, id);\r
+    NSCacheElement * element = NSProviderStorageRead(consumerSubList, id);\r
 \r
     if(element == NULL)\r
     {\r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index 59e3bb2..8722a63 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -28,11 +28,12 @@ NSResult NSSendTopicUpdation();
 NSResult NSInitTopicList()\r
 {\r
     NS_LOG(DEBUG, "NSInitTopicList - IN");\r
-    consumerTopicList = NSStorageCreate();\r
+\r
+    consumerTopicList = NSProviderStorageCreate();\r
     NS_VERIFY_NOT_NULL(consumerTopicList, NS_FAIL);\r
     consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME;\r
 \r
-    registeredTopicList = NSStorageCreate();\r
+    registeredTopicList = NSProviderStorageCreate();\r
     NS_VERIFY_NOT_NULL(registeredTopicList, NS_FAIL);\r
     registeredTopicList->cacheType = NS_PROVIDER_CACHE_REGISTER_TOPIC;\r
 \r
@@ -79,7 +80,7 @@ NSResult NSRegisterTopic(const char * topicName)
     element->data = (void *) data;\r
     element->next = NULL;\r
 \r
-    if (NSStorageWrite(registeredTopicList, element) != NS_OK)\r
+    if(NSProviderStorageWrite(registeredTopicList, element) != NS_OK)\r
     {\r
         NS_LOG(DEBUG, "fail to write cache");\r
         return NS_FAIL;\r
@@ -101,8 +102,8 @@ NSResult NSUnregisterTopic(const char * topicName)
         return NS_ERROR;\r
     }\r
 \r
-    result = NSStorageDelete(registeredTopicList, topicName);\r
-    while (NSStorageDelete(consumerTopicList, topicName) != NS_FAIL)\r
+    result = NSProviderStorageDelete(registeredTopicList, topicName);\r
+    while (NSProviderStorageDelete(consumerTopicList, topicName) != NS_FAIL)\r
     {\r
     }\r
 \r
@@ -206,7 +207,7 @@ NSResult NSSendTopicUpdationToConsumer(char *consumerId)
     OCRepPayloadSetPropInt(payload, NS_ATTRIBUTE_MESSAGE_ID, NS_TOPIC);\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, NSGetProviderInfo()->providerId);\r
 \r
-    NSCacheElement * element = NSStorageRead(consumerSubList, consumerId);\r
+    NSCacheElement * element = NSProviderStorageRead(consumerSubList, consumerId);\r
 \r
     if (element == NULL)\r
     {\r
@@ -351,8 +352,10 @@ NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest)
     NS_LOG_V(DEBUG, "TOPIC consumer ID = %s", consumerId);\r
 \r
     consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID;\r
-    while (NSStorageDelete(consumerTopicList, consumerId) != NS_FAIL)\r
-        ;\r
+
+    while (NSProviderStorageDelete(consumerTopicList, consumerId) != NS_FAIL)\r
+    {\r
+    }\r
     consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME;\r
 \r
     OCRepPayload ** topicListPayload = NULL;\r
@@ -392,7 +395,8 @@ NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest)
 \r
             newObj->data = (NSCacheData *) topicSubData;\r
             newObj->next = NULL;\r
-            NSStorageWrite(consumerTopicList, newObj);\r
+\r
+            NSProviderStorageWrite(consumerTopicList, newObj);
         }\r
     }\r
     NSSendTopicUpdationToConsumer(consumerId);\r
@@ -433,13 +437,13 @@ void * NSTopicSchedule(void * ptr)
                     {\r
                         newObj->data = node->taskData;\r
                         newObj->next = NULL;\r
-                        if (NSStorageWrite(consumerTopicList, newObj) == NS_OK)\r
+                        if (NSProviderStorageWrite(consumerTopicList, newObj) == NS_OK)\r
                         {\r
                             NSCacheTopicSubData * topicSubData =\r
                                     (NSCacheTopicSubData *) node->taskData;\r
                             NSSendTopicUpdationToConsumer(topicSubData->id);\r
                         }\r
-                    }\r
+                    }
                 }\r
                     break;\r
                 case TASK_UNSUBSCRIBE_TOPIC:\r