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>
#include "pthread.h"
#include "oic_string.h"
#include "oic_malloc.h"
+#include "ocstack.h"
#define TAG "NSProviderExample"
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);
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
{\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
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
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
}\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
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
\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
\r
NSCacheUpdateSubScriptionState(consumerSubList, consumerId, false);\r
NSSendResponse(consumerId, false);\r
- NSFreeConsumer(consumerId);\r
+ OICFree(consumerId);\r
\r
break;\r
}\r
#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
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
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
\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
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
\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