From 8e312b5270d63424e8ed4d93cb89eb98cfd6f696 Mon Sep 17 00:00:00 2001 From: "jaesick.shin" Date: Wed, 31 Aug 2016 17:05:21 +0900 Subject: [PATCH] Remove warning code in Provider Side. remove warning code only. Change-Id: I12f4ffc235817110e8a71c42f80d642569efb7f2 Signed-off-by: jaesick.shin Reviewed-on: https://gerrit.iotivity.org/gerrit/11209 Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- service/notification/examples/linux/notificationprovider.c | 8 ++++---- service/notification/src/provider/NSProviderInterface.c | 6 +++--- service/notification/src/provider/NSProviderListener.c | 2 +- service/notification/src/provider/NSProviderMemoryCache.c | 2 +- service/notification/src/provider/NSProviderMemoryCache.h | 2 +- service/notification/src/provider/NSProviderSubscription.c | 4 ++-- service/notification/src/provider/NSProviderSubscription.h | 2 +- service/notification/src/provider/NSProviderSystem.h | 2 ++ service/notification/src/provider/NSProviderTopic.c | 7 +++---- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c index cdf1f60..7deb1d3 100644 --- a/service/notification/examples/linux/notificationprovider.c +++ b/service/notification/examples/linux/notificationprovider.c @@ -30,6 +30,7 @@ #include "pthread.h" #include "oic_string.h" #include "oic_malloc.h" +#include "ocstack.h" #define TAG "NSProviderExample" @@ -221,14 +222,13 @@ int main() printf("id : %d\n", ++id); printf("title : "); - - gets(title); + fgets(title, sizeof(title), stdin); printf("body : "); - gets(body); + fgets(body, sizeof(body), stdin); printf("topic : "); - gets(topic); + fgets(topic, sizeof(topic), stdin); printf("app - mTitle : %s \n", title); printf("app - mContentText : %s \n", body); diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c index f828ff0..7c60796 100644 --- a/service/notification/src/provider/NSProviderInterface.c +++ b/service/notification/src/provider/NSProviderInterface.c @@ -84,7 +84,7 @@ void NSSetList() NS_LOG(DEBUG, "NSSetList - IN"); pthread_mutexattr_init(&NSCacheMutexAttr); - int pthreadResult = pthread_mutexattr_settype(&NSCacheMutexAttr, PTHREAD_MUTEX_RECURSIVE); + pthread_mutexattr_settype(&NSCacheMutexAttr, PTHREAD_MUTEX_RECURSIVE); pthread_mutex_init(&NSCacheMutex, &NSCacheMutexAttr); NSInitSubscriptionList(); @@ -252,7 +252,7 @@ NSTopicLL * NSProviderGetConsumerTopics(const char * consumerId) { NS_LOG(DEBUG, "consumer id should be set"); pthread_mutex_unlock(&nsInitMutex); - return NS_FAIL; + return NULL; } NSTopicLL * topics = NSProviderGetConsumerTopicsCacheData(registeredTopicList, @@ -306,7 +306,7 @@ NSResult NSProviderUnregisterTopic(const char * topicName) return NS_FAIL; } - NSPushQueue(TOPIC_SCHEDULER, TASK_DELETE_TOPIC, topicName); + NSPushQueue(TOPIC_SCHEDULER, TASK_DELETE_TOPIC, (void *) topicName); pthread_mutex_unlock(&nsInitMutex); NS_LOG(DEBUG, "NSProviderDeleteTopics - OUT"); diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c index 01011f9..eb8d4d3 100644 --- a/service/notification/src/provider/NSProviderListener.c +++ b/service/notification/src/provider/NSProviderListener.c @@ -247,7 +247,7 @@ OCEntityHandlerResult NSEntityHandlerTopicCb(OCEntityHandlerFlag flag, ehResult = OC_EH_ERROR; // Accepter is consumer. our service is support sendtopiclist from OC_REST_POST - if(!NSGetPolicy()) + if(NSGetPolicy() == false) { NSPushQueue(TOPIC_SCHEDULER, TASK_POST_TOPIC, NSCopyOCEntityHandlerRequest(entityHandlerRequest)); diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c index ea89441..e805cc3 100644 --- a/service/notification/src/provider/NSProviderMemoryCache.c +++ b/service/notification/src/provider/NSProviderMemoryCache.c @@ -516,7 +516,7 @@ NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList) } NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList, - NSCacheList * conTopicList, char *consumerId) + NSCacheList * conTopicList, const char * consumerId) { NS_LOG(DEBUG, "NSProviderGetConsumerTopicsCacheData - IN"); diff --git a/service/notification/src/provider/NSProviderMemoryCache.h b/service/notification/src/provider/NSProviderMemoryCache.h index 5608870..8f209fc 100644 --- a/service/notification/src/provider/NSProviderMemoryCache.h +++ b/service/notification/src/provider/NSProviderMemoryCache.h @@ -45,7 +45,7 @@ NSResult NSProviderDeleteSubDataFromObId(NSCacheList * list, OCObservationId id) NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList); NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList, - NSCacheList * conTopicList, char *consumerId); + NSCacheList * conTopicList, const char * consumerId); bool NSProviderIsTopicSubScribed(NSCacheElement * conTopicList, char * cId, char * topicName); diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c index 026fb6c..4a07a00 100644 --- a/service/notification/src/provider/NSProviderSubscription.c +++ b/service/notification/src/provider/NSProviderSubscription.c @@ -231,7 +231,7 @@ void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest) consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER_OBSERVE_ID; - while(NSStorageDelete(consumerSubList, (unsigned char *) + while(NSStorageDelete(consumerSubList, (char *) &(entityHandlerRequest->obsInfo.obsId)) != NS_FAIL); consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER; @@ -373,7 +373,7 @@ void * NSSubScriptionSchedule(void *ptr) NSCacheUpdateSubScriptionState(consumerSubList, consumerId, false); NSSendResponse(consumerId, false); - NSFreeConsumer(consumerId); + OICFree(consumerId); break; } diff --git a/service/notification/src/provider/NSProviderSubscription.h b/service/notification/src/provider/NSProviderSubscription.h index 9813250..f17883f 100644 --- a/service/notification/src/provider/NSProviderSubscription.h +++ b/service/notification/src/provider/NSProviderSubscription.h @@ -32,12 +32,12 @@ #include "NSProviderSystem.h" #include "oic_string.h" #include "oic_malloc.h" +#include NSCacheList * consumerSubList; NSResult NSInitSubscriptionList(); NSResult NSSetSubscriptionAccessPolicy(bool policy); -bool NSGetPolicy(); NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest); void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResourceType resourceType); void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest); diff --git a/service/notification/src/provider/NSProviderSystem.h b/service/notification/src/provider/NSProviderSystem.h index 4860bb4..a799a70 100644 --- a/service/notification/src/provider/NSProviderSystem.h +++ b/service/notification/src/provider/NSProviderSystem.h @@ -36,5 +36,7 @@ void NSInitProviderInfo(const char * userInfo); void NSDeinitProviderInfo(); NSProviderInfo * NSGetProviderInfo(); const char * NSGetUserInfo(); +bool NSGetPolicy(); +void NSSetPolicy(bool policy); #endif /* _NS_PROVIDER_SYSTEM__H_ */ diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c index 8538550..5474671 100644 --- a/service/notification/src/provider/NSProviderTopic.c +++ b/service/notification/src/provider/NSProviderTopic.c @@ -62,7 +62,7 @@ NSResult NSAddTopics(const char * topicName) NS_LOG(DEBUG, "NSWriteTopicsToStorage()"); NSCacheTopicData * data = (NSCacheTopicData *)OICMalloc(sizeof(NSCacheTopicData)); - data->topicName = topicName; + data->topicName = (char *)topicName; data->state = NS_TOPIC_UNSUBSCRIBED; NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement)); @@ -218,7 +218,6 @@ NSResult NSSendTopicList(OCEntityHandlerRequest * entityHandlerRequest) char * id = NSGetValueFromQuery(OICStrdup(entityHandlerRequest->query), NS_QUERY_CONSUMER_ID); NSTopicLL * topics = NULL; - NSCacheElement * currList = NULL; if(!id) { @@ -312,7 +311,7 @@ NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest) NS_LOG(DEBUG, "NSPostConsumerTopics() - IN"); char * consumerId = NULL; - OCRepPayload * payload = entityHandlerRequest->payload; + OCRepPayload * payload = (OCRepPayload *) entityHandlerRequest->payload; OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_CONSUMER_ID, &consumerId); if(!consumerId) @@ -341,7 +340,7 @@ NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest) OCRepPayloadGetPropString(topicListPayload[i], NS_ATTRIBUTE_TOPIC_NAME, &topicName); OCRepPayloadGetPropInt(topicListPayload[i], NS_ATTRIBUTE_TOPIC_SELECTION, &topicState); - NS_LOG_V(DEBUG, "Topic Name(state): %s(%d)", topicName, topicState); + NS_LOG_V(DEBUG, "Topic Name(state): %s(%d)", topicName, (int)topicState); if(NS_TOPIC_SUBSCRIBED == (NSTopicState)topicState) { -- 2.7.4