Remove warning code in Provider Side.

remove warning code only.

Change-Id: I12f4ffc235817110e8a71c42f80d642569efb7f2
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11209
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index cdf1f60..7deb1d3 100644 (file)
--- 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 (file)
--- 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");\r
 \r
     pthread_mutexattr_init(&NSCacheMutexAttr);\r
-    int pthreadResult = pthread_mutexattr_settype(&NSCacheMutexAttr, PTHREAD_MUTEX_RECURSIVE);\r
+    pthread_mutexattr_settype(&NSCacheMutexAttr, PTHREAD_MUTEX_RECURSIVE);\r
     pthread_mutex_init(&NSCacheMutex, &NSCacheMutexAttr);\r
 \r
     NSInitSubscriptionList();\r
@@ -252,7 +252,7 @@ NSTopicLL * NSProviderGetConsumerTopics(const char * consumerId)
     {\r
         NS_LOG(DEBUG, "consumer id should be set");\r
         pthread_mutex_unlock(&nsInitMutex);\r
-        return NS_FAIL;\r
+        return NULL;\r
     }\r
 \r
     NSTopicLL * topics = NSProviderGetConsumerTopicsCacheData(registeredTopicList,\r
@@ -306,7 +306,7 @@ NSResult NSProviderUnregisterTopic(const char * topicName)
         return NS_FAIL;\r
     }\r
 \r
-    NSPushQueue(TOPIC_SCHEDULER, TASK_DELETE_TOPIC, topicName);\r
+    NSPushQueue(TOPIC_SCHEDULER, TASK_DELETE_TOPIC, (void *) topicName);\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
     NS_LOG(DEBUG, "NSProviderDeleteTopics - OUT");\r

diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c
index 01011f9..eb8d4d3 100644 (file)
--- 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;\r
 \r
             // Accepter is consumer. our service is support sendtopiclist from OC_REST_POST\r
-            if(!NSGetPolicy())\r
+            if(NSGetPolicy() == false)\r
             {\r
                 NSPushQueue(TOPIC_SCHEDULER, TASK_POST_TOPIC,\r
                         NSCopyOCEntityHandlerRequest(entityHandlerRequest));\r

diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c
index ea89441..e805cc3 100644 (file)
--- a/service/notification/src/provider/NSProviderMemoryCache.c
+++ b/service/notification/src/provider/NSProviderMemoryCache.c
@@ -516,7 +516,7 @@ NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList)
 }\r
 \r
 NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList,\r
-        NSCacheList * conTopicList, char *consumerId)\r
+        NSCacheList * conTopicList, const char * consumerId)\r
 {\r
     NS_LOG(DEBUG, "NSProviderGetConsumerTopicsCacheData - IN");\r
 \r

diff --git a/service/notification/src/provider/NSProviderMemoryCache.h b/service/notification/src/provider/NSProviderMemoryCache.h
index 5608870..8f209fc 100644 (file)
--- 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);\r
 \r
 NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList,\r
-        NSCacheList * conTopicList, char *consumerId);\r
+        NSCacheList * conTopicList, const char * consumerId);\r
 \r
 bool NSProviderIsTopicSubScribed(NSCacheElement * conTopicList, char * cId, char * topicName);\r
 \r

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 026fb6c..4a07a00 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -231,7 +231,7 @@ void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest)
 \r
     consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER_OBSERVE_ID;\r
 \r
-    while(NSStorageDelete(consumerSubList, (unsigned char *)\r
+    while(NSStorageDelete(consumerSubList, (char *)\r
             &(entityHandlerRequest->obsInfo.obsId)) != NS_FAIL);\r
     consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER;\r
 \r
@@ -373,7 +373,7 @@ void * NSSubScriptionSchedule(void *ptr)
 \r
                     NSCacheUpdateSubScriptionState(consumerSubList, consumerId, false);\r
                     NSSendResponse(consumerId, false);\r
-                    NSFreeConsumer(consumerId);\r
+                    OICFree(consumerId);\r
 \r
                     break;\r
                 }\r

diff --git a/service/notification/src/provider/NSProviderSubscription.h b/service/notification/src/provider/NSProviderSubscription.h
index 9813250..f17883f 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.h
+++ b/service/notification/src/provider/NSProviderSubscription.h
@@ -32,12 +32,12 @@
 #include "NSProviderSystem.h"\r
 #include "oic_string.h"\r
 #include "oic_malloc.h"\r
+#include <stdbool.h>\r
 \r
 NSCacheList * consumerSubList;\r
 \r
 NSResult NSInitSubscriptionList();\r
 NSResult NSSetSubscriptionAccessPolicy(bool policy);\r
-bool NSGetPolicy();\r
 NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest);\r
 void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResourceType resourceType);\r
 void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest);\r

diff --git a/service/notification/src/provider/NSProviderSystem.h b/service/notification/src/provider/NSProviderSystem.h
index 4860bb4..a799a70 100644 (file)
--- 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();\r
 NSProviderInfo * NSGetProviderInfo();\r
 const char * NSGetUserInfo();\r
+bool NSGetPolicy();\r
+void NSSetPolicy(bool policy);\r
 \r
 #endif /* _NS_PROVIDER_SYSTEM__H_ */\r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index 8538550..5474671 100644 (file)
--- 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()");\r
 \r
     NSCacheTopicData * data = (NSCacheTopicData *)OICMalloc(sizeof(NSCacheTopicData));\r
-    data->topicName = topicName;\r
+    data->topicName = (char *)topicName;\r
     data->state = NS_TOPIC_UNSUBSCRIBED;\r
 \r
     NSCacheElement * element = (NSCacheElement *) OICMalloc(sizeof(NSCacheElement));\r
@@ -218,7 +218,6 @@ NSResult NSSendTopicList(OCEntityHandlerRequest * entityHandlerRequest)
 \r
     char * id = NSGetValueFromQuery(OICStrdup(entityHandlerRequest->query), NS_QUERY_CONSUMER_ID);\r
     NSTopicLL * topics = NULL;\r
-    NSCacheElement * currList = NULL;\r
 \r
     if(!id)\r
     {\r
@@ -312,7 +311,7 @@ NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest)
     NS_LOG(DEBUG, "NSPostConsumerTopics() - IN");\r
 \r
     char * consumerId = NULL;\r
-    OCRepPayload * payload = entityHandlerRequest->payload;\r
+    OCRepPayload * payload = (OCRepPayload *) entityHandlerRequest->payload;\r
     OCRepPayloadGetPropString(payload, NS_ATTRIBUTE_CONSUMER_ID, &consumerId);\r
 \r
     if(!consumerId)\r
@@ -341,7 +340,7 @@ NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest)
 \r
         OCRepPayloadGetPropString(topicListPayload[i], NS_ATTRIBUTE_TOPIC_NAME, &topicName);\r
         OCRepPayloadGetPropInt(topicListPayload[i], NS_ATTRIBUTE_TOPIC_SELECTION, &topicState);\r
-        NS_LOG_V(DEBUG, "Topic Name(state):  %s(%d)", topicName, topicState);\r
+        NS_LOG_V(DEBUG, "Topic Name(state):  %s(%d)", topicName, (int)topicState);\r
 \r
         if(NS_TOPIC_SUBSCRIBED == (NSTopicState)topicState)\r
         {\r