return g_NSCacheMutex;
}
-NSCacheList * NSStorageCreate()
+NSCacheList * NSConsumerStorageCreate()
{
pthread_mutex_t * mutex = NSGetCacheMutex();
pthread_mutex_lock(mutex);
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);
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);
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);
if (type == NS_CONSUMER_CACHE_PROVIDER)
{
- NSRemoveProvider_internal((NSProvider_internal *) del->data);
+ NSRemoveProvider_internal((void *) del->data);
}
NSOICFree(del);
pthread_mutex_unlock(mutex);
NSProvider_internal * newProvObj = (NSProvider_internal *) newObj->data;
- NSCacheElement * it = NSStorageRead(list, newProvObj->providerId);
+ NSCacheElement * it = NSConsumerStorageRead(list, newProvObj->providerId);
pthread_mutex_lock(mutex);
NSCacheElement * obj = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement));
NS_VERIFY_NOT_NULL_WITH_POST_CLEANING(obj, NS_ERROR, pthread_mutex_unlock(mutex));
- NS_LOG_V(DEBUG, "New Object address : %s:%d", newProvObj->connection->addr->addr, newProvObj->connection->addr->port);
+ NS_LOG_V(INFO_PRIVATE, "New Object address : %s:%d", newProvObj->connection->addr->addr, newProvObj->connection->addr->port);
obj->data = (void *) NSCopyProvider_internal(newProvObj);
if (!obj->data)
{
NS_LOG (ERROR, "Failed to CopyProvider");
+ NSOICFree(obj);
pthread_mutex_unlock(mutex);
return NS_ERROR;
}
-NSResult NSStorageDestroy(NSCacheList * list)
+NSResult NSConsumerStorageDestroy(NSCacheList * list)
{
NS_VERIFY_NOT_NULL(list, NS_ERROR);
{
next = (NSCacheElement *) iter->next;
- NSRemoveProvider_internal((NSProvider_internal *) iter->data);
+ NSRemoveProvider_internal((void *) iter->data);
NSOICFree(iter);
iter = next;