modify about rule of coding.

this patch include,
1. modify if statement and while statement about rule of coding.
2. remove unused function.

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

diff --git a/service/notification/include/NSCommon.h b/service/notification/include/NSCommon.h
index be47df4..9f6e35c 100644 (file)
--- a/service/notification/include/NSCommon.h
+++ b/service/notification/include/NSCommon.h
@@ -54,6 +54,7 @@ typedef enum
     NS_TOPIC = 3,
     NS_DISCOVERED = 11,
     NS_STOPPED = 12
+
 } NSProviderState;
 
 /**

diff --git a/service/notification/src/common/NSConstants.h b/service/notification/src/common/NSConstants.h
index cbfca9a..983f2a3 100644 (file)
--- a/service/notification/src/common/NSConstants.h
+++ b/service/notification/src/common/NSConstants.h
@@ -220,6 +220,7 @@ typedef enum eSchedulerType
     SUBSCRIPTION_SCHEDULER = 2,
     NOTIFICATION_SCHEDULER = 3,
     TOPIC_SCHEDULER = 4,
+
 } NSSchedulerType;
 
 typedef enum eTaskType
@@ -300,6 +301,7 @@ typedef enum eCacheType
 
     NS_CONSUMER_CACHE_PROVIDER = 2000,
     NS_CONSUMER_CACHE_MESSAGE = 2001,
+
 } NSCacheType;
 
 typedef enum eResourceType
@@ -307,12 +309,14 @@ typedef enum eResourceType
     NS_RESOURCE_MESSAGE = 1000,
     NS_RESOURCE_SYNC = 1001,
     NS_RESOURCE_TOPIC = 1002,
+
 } NSResourceType;
 
 typedef enum eInterfaceType
 {
     NS_INTERFACE_TYPE_READ = 1,
     NS_INTERFACE_TYPE_READWRITE = 2,
+
 } NSInterfaceType;
 
 #endif /* _NS_CONSTANTS_H_ */

diff --git a/service/notification/src/common/NSStructs.h b/service/notification/src/common/NSStructs.h
index bb9a15f..ceb84a3 100644 (file)
--- a/service/notification/src/common/NSStructs.h
+++ b/service/notification/src/common/NSStructs.h
@@ -35,6 +35,7 @@ typedef struct _nsTask
     NSTaskType taskType;\r
     void * taskData;\r
     struct _nsTask * nextTask;\r
+\r
 } NSTask;\r
 \r
 typedef struct\r
@@ -52,6 +53,7 @@ typedef struct _NSCacheElement
 {\r
     NSCacheData * data;\r
     struct _NSCacheElement * next;\r
+\r
 } NSCacheElement;\r
 \r
 typedef struct\r
@@ -59,6 +61,7 @@ typedef struct
     NSCacheType cacheType;\r
     NSCacheElement * head;\r
     NSCacheElement * tail;\r
+\r
 } NSCacheList;\r
 \r
 typedef struct\r
@@ -69,6 +72,7 @@ typedef struct
     int remote_syncObId; //sync observer ID subscribed through remote server\r
     int remote_messageObId; //message observer ID subscribed through remote server\r
     bool isWhite; // access state -> True: allowed / False: blocked\r
+\r
 } NSCacheSubData;\r
 \r
 typedef struct\r
@@ -76,6 +80,7 @@ typedef struct
     char * id;\r
     int messageType; // noti = 1, read = 2, dismiss = 3\r
     NSMessage * nsMessage;\r
+\r
 } NSCacheMsgData;\r
 \r
 typedef struct\r
@@ -103,6 +108,7 @@ typedef struct
 \r
     //optional\r
     char * topic_uri;\r
+\r
 } NSNotificationResource;\r
 \r
 typedef struct\r
@@ -121,6 +127,7 @@ typedef struct
     char * sourceName;\r
     char * topicName;\r
     NSMediaContents * mediaContents;\r
+\r
 } NSMessageResource;\r
 \r
 typedef struct\r
@@ -129,6 +136,7 @@ typedef struct
     char * id;\r
     char providerId[NS_UUID_STRING_SIZE];\r
     char * state;\r
+\r
 } NSSyncResource;\r
 \r
 typedef struct\r
@@ -137,6 +145,7 @@ typedef struct
     char providerId[NS_UUID_STRING_SIZE];\r
     char consumerId[NS_UUID_STRING_SIZE];\r
     NSTopicList ** TopicList;\r
+\r
 } NSTopicResource;\r
 \r
 typedef struct\r
@@ -144,6 +153,7 @@ typedef struct
     char providerId[NS_UUID_STRING_SIZE];\r
     char * providerName;\r
     char * userInfo;\r
+\r
 } NSProviderInfo;\r
 \r
 #endif /* _NS_STRUCTS_H_ */\r

diff --git a/service/notification/src/common/NSUtil.c b/service/notification/src/common/NSUtil.c
index 14ca14b..2789366 100755 (executable)
--- a/service/notification/src/common/NSUtil.c
+++ b/service/notification/src/common/NSUtil.c
@@ -35,7 +35,7 @@ OCEntityHandlerRequest *NSCopyOCEntityHandlerRequest(OCEntityHandlerRequest *ent
         if (copyOfRequest->query)
         {
             copyOfRequest->query = OICStrdup(entityHandlerRequest->query);
-            if(!copyOfRequest->query)
+            if (!copyOfRequest->query)
             {
                 NS_LOG(ERROR, "Copy failed due to allocation failure");
                 OICFree(copyOfRequest);
@@ -107,7 +107,7 @@ NSMessage * NSDuplicateMessage(NSMessage * copyMsg)
 {
     NSMessage * newMsg = NULL;
 
-    if(copyMsg == NULL)
+    if (copyMsg == NULL)
     {
         NS_LOG(ERROR, "Copy Msg is NULL");
         return NULL;
@@ -119,7 +119,7 @@ NSMessage * NSDuplicateMessage(NSMessage * copyMsg)
     newMsg->messageId = copyMsg->messageId;
     OICStrcpy(newMsg->providerId, UUID_STRING_SIZE, copyMsg->providerId);
 
-    if(copyMsg->dateTime)
+    if (copyMsg->dateTime)
     {
         newMsg->dateTime = OICStrdup(copyMsg->dateTime);
     }
@@ -175,7 +175,7 @@ NSSyncInfo* NSDuplicateSync(NSSyncInfo * copyMsg)
 {
     NSSyncInfo * newMsg = NULL;
 
-    if(!copyMsg)
+    if (!copyMsg)
     {
         NS_LOG(ERROR, "Copy Msg is NULL");
         return NULL;
@@ -183,7 +183,7 @@ NSSyncInfo* NSDuplicateSync(NSSyncInfo * copyMsg)
 
     newMsg = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
 
-    if(!newMsg)
+    if (!newMsg)
     {
         NS_LOG(ERROR, "newMsg is NULL");
         return NULL;
@@ -215,7 +215,7 @@ NSConsumer* NSDuplicateConsumer(NSConsumer * copyMsg)
 {
     NSConsumer * newMsg = NULL;
 
-    if(copyMsg == NULL)
+    if (copyMsg == NULL)
     {
         NS_LOG(ERROR, "Copy Msg is NULL");
         return NULL;
@@ -223,7 +223,7 @@ NSConsumer* NSDuplicateConsumer(NSConsumer * copyMsg)
 
     newMsg = (NSConsumer *)OICMalloc(sizeof(NSConsumer));
 
-    if(!newMsg)
+    if (!newMsg)
     {
         NS_LOG(ERROR, "newMsg is NULL");
         return NULL;
@@ -239,7 +239,7 @@ NSConsumer* NSDuplicateConsumer(NSConsumer * copyMsg)
 void NSDuplicateSetPropertyString(OCRepPayload** msgPayload, const char * name,
         const char * copyString)
 {
-    if(copyString)
+    if (copyString)
     {
         OCRepPayloadSetPropString(*msgPayload, name, copyString);
     }
@@ -248,7 +248,7 @@ void NSDuplicateSetPropertyString(OCRepPayload** msgPayload, const char * name,
 void NSDuplicateSetPropertyInt(OCRepPayload** msgPayload, const char * name,
         int64_t value)
 {
-    if(value)
+    if (value)
     {
         OCRepPayloadSetPropInt(*msgPayload, name, value);
     }
@@ -260,11 +260,13 @@ NSSyncInfo * NSGetSyncInfo(OCPayload * payload)
     char * providerId = NULL;
     int64_t state = 0;
 
-    if(!payload)
+    if (!payload)
     {
         return NULL;
     }
+
     NSSyncInfo * retSync = (NSSyncInfo *)OICMalloc(sizeof(NSSyncInfo));
+
     if (!retSync)
     {
         return NULL;
@@ -272,8 +274,8 @@ NSSyncInfo * NSGetSyncInfo(OCPayload * payload)
 
     retSync->messageId = 0;
     retSync->state = NS_SYNC_READ;
-
     OCRepPayload * repPayload = (OCRepPayload *)payload;
+
     if (!OCRepPayloadGetPropInt(repPayload, NS_ATTRIBUTE_MESSAGE_ID,
             (int64_t *)&retSync->messageId))
     {
@@ -329,7 +331,7 @@ char * NSGetValueFromQuery(char *query, char * compareKey)
 
     NS_LOG_V(INFO, "NS Query Params = %s", query);
 
-    if(!query || query[0] == '\0' || !strlen(query))
+    if (!query || query[0] == '\0' || !strlen(query))
     {
         NS_LOG(ERROR, "query is null or \\0 or size is 0");
         return NULL;
@@ -369,7 +371,7 @@ char * NSGetValueFromQuery(char *query, char * compareKey)
 
 NSResult NSFreeMalloc(char ** obj)
 {
-    if(*obj)
+    if (*obj)
     {
         OICFree(*obj);
         *obj = NULL;
@@ -381,20 +383,20 @@ NSResult NSFreeMalloc(char ** obj)
 
 NSMediaContents * NSDuplicateMediaContents(NSMediaContents * copyObj)
 {
-    if(!copyObj)
+    if (!copyObj)
     {
         return NULL;
     }
 
     NSMediaContents * newObj = (NSMediaContents *)OICMalloc(sizeof(NSMediaContents));
 
-    if(!newObj)
+    if (!newObj)
     {
         NS_LOG(ERROR, "contents newObj is NULL");
         return NULL;
     }
 
-    if(copyObj->iconImage)
+    if (copyObj->iconImage)
     {
         newObj->iconImage = OICStrdup(copyObj->iconImage);
     }
@@ -404,7 +406,7 @@ NSMediaContents * NSDuplicateMediaContents(NSMediaContents * copyObj)
 
 NSResult NSFreeMediaContents(NSMediaContents * obj)
 {
-    if(!obj)
+    if (!obj)
     {
         return NS_FAIL;
     }
@@ -419,7 +421,7 @@ NSMessage * NSInitializeMessage()
 {
     NSMessage * msg = (NSMessage *)OICMalloc(sizeof(NSMessage));
 
-    if(!msg)
+    if (!msg)
     {
         NS_LOG(ERROR, "Msg is NULL");
         return NULL;
@@ -449,7 +451,8 @@ OCRepPayloadValue* NSPayloadFindValue(const OCRepPayload* payload, const char* n
     }
 
     OCRepPayloadValue* val = payload->values;
-    while(val)
+
+    while (val)
     {
         if (0 == strcmp(val->name, name))
         {
@@ -465,7 +468,7 @@ NSTopicList * NSInitializeTopicList()
 {
     NSTopicList * topicList = (NSTopicList *)OICMalloc(sizeof(NSTopicList));
 
-    if(!topicList)
+    if (!topicList)
     {
         NS_LOG(ERROR, "topicList is NULL");
         return NULL;
@@ -478,16 +481,3 @@ NSTopicList * NSInitializeTopicList()
     return topicList;
 }
 
-NSResult NSFreeTopicList(NSTopicList * topicList)
-{
-    if (!topicList)
-    {
-        return NS_ERROR;
-    }
-
-    //TODO:Free Topic List
-
-
-    return NS_OK;
-}
-

diff --git a/service/notification/src/provider/NSProviderCallbackResponse.c b/service/notification/src/provider/NSProviderCallbackResponse.c
index e079f8c..6c60c04 100644 (file)
--- a/service/notification/src/provider/NSProviderCallbackResponse.c
+++ b/service/notification/src/provider/NSProviderCallbackResponse.c
@@ -93,11 +93,12 @@ void * NSCallbackResponseSchedule(void * ptr)
                     char * copyQuery = OICStrdup(request->query);\r
                     char * consumerId = NSGetValueFromQuery(copyQuery, NS_QUERY_CONSUMER_ID);\r
 \r
-                    if(consumerId)\r
+                    if (consumerId)\r
                     {\r
                         OICStrcpy(consumer->consumerId, UUID_STRING_SIZE, consumerId);\r
                         NSSubscribeRequestCb(consumer);\r
                     }\r
+\r
                     OICFree(copyQuery);\r
                     NSFreeConsumer(consumer);\r
                     NSFreeOCEntityHandlerRequest(request);\r

diff --git a/service/notification/src/provider/NSProviderDiscovery.c b/service/notification/src/provider/NSProviderDiscovery.c
index 81b5903..2ff973b 100644 (file)
--- a/service/notification/src/provider/NSProviderDiscovery.c
+++ b/service/notification/src/provider/NSProviderDiscovery.c
@@ -79,7 +79,7 @@ void * NSDiscoverySchedule(void * ptr)
                     NS_LOG(DEBUG, "CASE TASK_REGISTER_RESOURCE : ");\r
                     NSRegisterResource();\r
                     break;\r
-#if(defined WITH_CLOUD && defined RD_CLIENT)\r
+#if (defined WITH_CLOUD && defined RD_CLIENT)\r
                 case TASK_PUBLISH_RESOURCE:\r
                     NS_LOG(DEBUG, "CASE TASK_PUBLISH_PESOURCE : ");\r
                     NSPublishResourceToCloud((char*)node->taskData);\r

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index 84c3809..7adad28 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -92,10 +92,11 @@ NSResult NSStartProvider(NSProviderConfig config)
 #ifdef SECURED
         NS_LOG(DEBUG, "Built with SECURED");
 
-        if(!config.resourceSecurity)
+        if (!config.resourceSecurity)
         {
             NS_LOG(DEBUG, "Resource Security Off");
         }
+
         NSSetResourceSecurity(config.resourceSecurity);
 #endif
 
@@ -121,7 +122,7 @@ NSResult NSStopProvider()
     NS_LOG(DEBUG, "NSStopProvider - IN");
     pthread_mutex_lock(&nsInitMutex);
 
-    if(initProvider)
+    if (initProvider)
     {
         NSPushQueue(DISCOVERY_SCHEDULER, TASK_STOP_PRESENCE, NULL);
         NSDeinitProviderInfo();
@@ -141,16 +142,17 @@ NSResult NSStopProvider()
 
 NSResult NSProviderEnableRemoteService(char *serverAddress)
 {
-#if(defined WITH_CLOUD && defined RD_CLIENT)
+#if (defined WITH_CLOUD && defined RD_CLIENT)
     NS_LOG(DEBUG, "NSProviderEnableRemoteService - IN");
     pthread_mutex_lock(&nsInitMutex);
 
-    if(!initProvider || !serverAddress)
+    if (!initProvider || !serverAddress)
     {
         NS_LOG(DEBUG, "Provider service has not been started yet");
         pthread_mutex_unlock(&nsInitMutex);
         return NS_FAIL;
     }
+
     NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress);
     NS_LOG(DEBUG, "Request to publish resource");
     NSPushQueue(DISCOVERY_SCHEDULER, TASK_PUBLISH_RESOURCE, serverAddress);
@@ -167,15 +169,16 @@ NSResult NSProviderEnableRemoteService(char *serverAddress)
 
 NSResult NSProviderDisableRemoteService(char *serverAddress)
 {
-#if(defined WITH_CLOUD && defined RD_CLIENT)
+#if (defined WITH_CLOUD && defined RD_CLIENT)
     NS_LOG(DEBUG, "NSProviderDisableRemoteService - IN");
     pthread_mutex_lock(&nsInitMutex);
 
-    if(!initProvider || !serverAddress)
+    if (!initProvider || !serverAddress)
     {
         NS_LOG(DEBUG, "Provider service has not been started yet");
         return NS_FAIL;
     }
+
     NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress);
 
     NS_LOG(DEBUG, "Delete remote server info");

diff --git a/service/notification/src/provider/NSProviderListener.c b/service/notification/src/provider/NSProviderListener.c
index dfd28e7..1f3723f 100644 (file)
--- a/service/notification/src/provider/NSProviderListener.c
+++ b/service/notification/src/provider/NSProviderListener.c
@@ -141,7 +141,7 @@ OCEntityHandlerResult NSEntityHandlerMessageCb(OCEntityHandlerFlag flag,
                 return ehResult;\r
             }\r
         }\r
-        else if(ocObAction == OC_OBSERVE_DEREGISTER)\r
+        else if (ocObAction == OC_OBSERVE_DEREGISTER)\r
         {\r
             NS_LOG(DEBUG, "NSEntityHandlerMessageCb - OC_OBSERVE_DEREGISTER");\r
             NS_LOG_V(DEBUG, "NSEntityHandlerMessageCb\n - "\r
@@ -203,7 +203,7 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag,
 \r
             NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_REST_POST");\r
 \r
-            if(NSProviderIsSyncAttributes((OCRepPayload *)entityHandlerRequest->payload))\r
+            if (NSProviderIsSyncAttributes((OCRepPayload *)entityHandlerRequest->payload))\r
             {\r
                 NSPushQueue(NOTIFICATION_SCHEDULER, TASK_RECV_READ,\r
                                     NSGetSyncInfo(entityHandlerRequest->payload));\r
@@ -233,7 +233,7 @@ OCEntityHandlerResult NSEntityHandlerSyncCb(OCEntityHandlerFlag flag,
             NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SYNC_SUBSCRIPTION,\r
                     NSCopyOCEntityHandlerRequest(entityHandlerRequest));\r
         }\r
-        else if(ocObAction == OC_OBSERVE_DEREGISTER)\r
+        else if (ocObAction == OC_OBSERVE_DEREGISTER)\r
         {\r
             NS_LOG(DEBUG, "NSEntityHandlerSyncCb - OC_OBSERVE_DEREGISTER");\r
             NS_LOG_V(DEBUG, "NSEntityHandlerSyncCb\n - "\r
@@ -301,7 +301,7 @@ OCEntityHandlerResult NSEntityHandlerTopicCb(OCEntityHandlerFlag flag,
             NS_LOG(DEBUG, "NSEntityHandlerTopicCb - OC_REST_POST");\r
             // Accepter is provider. our service is not support sendtopiclist from OC_REST_POST\r
             // Accepter is consumer. our service is support sendtopiclist from OC_REST_POST\r
-            if(NSGetPolicy() == false &&\r
+            if (NSGetPolicy() == false &&\r
                     NSProviderIsTopicAttributes(OCRepPayloadClone((OCRepPayload *)\r
                             entityHandlerRequest->payload)))\r
             {\r
@@ -339,7 +339,7 @@ void NSProviderConnectionStateListener(const CAEndpoint_t * info, bool connected
         // Start Presence\r
         NSPushQueue(DISCOVERY_SCHEDULER, TASK_START_PRESENCE, NULL);\r
 \r
-        if(info->adapter == CA_ADAPTER_TCP)\r
+        if (info->adapter == CA_ADAPTER_TCP)\r
         {\r
             NS_LOG_V(DEBUG, "TCP Connected remote address: %s:%d", info->addr, info->port);\r
         }\r
@@ -351,7 +351,7 @@ void NSProviderConnectionStateListener(const CAEndpoint_t * info, bool connected
         // Set Connection State\r
         NSSetProviderConnectionState(DISCONNECTED);\r
 \r
-        if(info->adapter == CA_ADAPTER_TCP)\r
+        if (info->adapter == CA_ADAPTER_TCP)\r
         {\r
             NS_LOG_V(DEBUG, "TCP Disconnected remote address: %s:%d", info->addr, info->port);\r
         }\r
@@ -403,14 +403,15 @@ bool NSProviderCompareSyncAttributes(const char * name)
 bool NSProviderIsSyncAttributes(OCRepPayload * payload)\r
 {\r
     NS_LOG(DEBUG, "get extra info");\r
-\r
     OCRepPayloadValue * curr = payload->values;\r
-    while(curr)\r
+\r
+    while (curr)\r
     {\r
         if (!NSProviderCompareSyncAttributes(curr->name))\r
         {\r
             return false;\r
         }\r
+\r
         curr = curr->next;\r
     }\r
 \r
@@ -442,9 +443,9 @@ bool NSProviderCompareSubTopicAttributes(const char * name)
 bool NSProviderIsTopicAttributes(OCRepPayload * payload)\r
 {\r
     NS_LOG(DEBUG, "get extra info");\r
-\r
     OCRepPayloadValue * curr = payload->values;\r
-    while(curr)\r
+\r
+    while (curr)\r
     {\r
         if (!NSProviderCompareTopicAttributes(curr->name))\r
         {\r
@@ -470,7 +471,8 @@ bool NSProviderIsTopicAttributes(OCRepPayload * payload)
             for (int i = 0; i < (int) dimensionSize; i++)\r
             {\r
                 OCRepPayloadValue * subCurr = topicListPayload[i]->values;\r
-                while(subCurr)\r
+\r
+                while (subCurr)\r
                 {\r
                     if (!NSProviderCompareSubTopicAttributes(subCurr->name))\r
                     {\r

diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c
index bcc0bfb..90da361 100644 (file)
--- a/service/notification/src/provider/NSProviderMemoryCache.c
+++ b/service/notification/src/provider/NSProviderMemoryCache.c
@@ -25,6 +25,7 @@ NSCacheList * NSProviderStorageCreate()
 {\r
     pthread_mutex_lock(&NSCacheMutex);\r
     NSCacheList * newList = (NSCacheList *) OICMalloc(sizeof(NSCacheList));\r
+\r
     if (!newList)\r
     {\r
         pthread_mutex_unlock(&NSCacheMutex);\r
@@ -194,7 +195,7 @@ NSResult NSProviderStorageWrite(NSCacheList * list, NSCacheElement * newObj)
         }\r
 \r
     }\r
-    else if(type == NS_PROVIDER_CACHE_REGISTER_TOPIC)\r
+    else if (type == NS_PROVIDER_CACHE_REGISTER_TOPIC)\r
     {\r
         NS_LOG(DEBUG, "Type is REGITSTER TOPIC");\r
 \r
@@ -211,7 +212,7 @@ NSResult NSProviderStorageWrite(NSCacheList * list, NSCacheElement * newObj)
             return NS_FAIL;\r
         }\r
     }\r
-    else if(type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME)\r
+    else if (type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME)\r
     {\r
         NS_LOG(DEBUG, "Type is REGITSTER TOPIC");\r
 \r
@@ -228,7 +229,7 @@ NSResult NSProviderStorageWrite(NSCacheList * list, NSCacheElement * newObj)
             return NS_FAIL;\r
         }\r
     }\r
-    else if(type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID)\r
+    else if (type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID)\r
     {\r
         NS_LOG(DEBUG, "Type is REGITSTER TOPIC");\r
 \r
@@ -399,7 +400,7 @@ NSResult NSProviderDeleteCacheData(NSCacheType type, void * data)
         OICFree(subData);\r
         return NS_OK;\r
     }\r
-    else if(type == NS_PROVIDER_CACHE_REGISTER_TOPIC)\r
+    else if (type == NS_PROVIDER_CACHE_REGISTER_TOPIC)\r
     {\r
 \r
         NSCacheTopicData * topicData = (NSCacheTopicData *) data;\r
@@ -409,7 +410,7 @@ NSResult NSProviderDeleteCacheData(NSCacheType type, void * data)
         OICFree(topicData->topicName);\r
         OICFree(topicData);\r
     }\r
-    else if(type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME ||\r
+    else if (type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME ||\r
             type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID)\r
     {\r
         NSCacheTopicSubData * topicData = (NSCacheTopicSubData *) data;\r
@@ -428,7 +429,7 @@ NSResult NSProviderStorageDelete(NSCacheList * list, const char * delId)
 \r
     NSCacheType type = list->cacheType;\r
 \r
-    if(!del)\r
+    if (!del)\r
     {\r
         NS_LOG(DEBUG, "list head is NULL");\r
         pthread_mutex_unlock(&NSCacheMutex);\r
@@ -453,6 +454,7 @@ NSResult NSProviderStorageDelete(NSCacheList * list, const char * delId)
     }\r
 \r
     del = del->next;\r
+\r
     while (del)\r
     {\r
         if (NSProviderCompareIdCacheData(type, del->data, delId))\r
@@ -472,6 +474,7 @@ NSResult NSProviderStorageDelete(NSCacheList * list, const char * delId)
         prev = del;\r
         del = del->next;\r
     }\r
+\r
     pthread_mutex_unlock(&NSCacheMutex);\r
     return NS_FAIL;\r
 }\r
@@ -483,7 +486,7 @@ NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList)
 \r
     NSCacheElement * iter = regTopicList->head;\r
 \r
-    if(!iter)\r
+    if (!iter)\r
     {\r
         pthread_mutex_unlock(&NSCacheMutex);\r
         return NULL;\r
@@ -497,7 +500,8 @@ NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList)
     {\r
         NSCacheTopicData * curr = (NSCacheTopicData *) iter->data;\r
         newTopic = (NSTopicLL *) OICMalloc(sizeof(NSTopicLL));\r
-        if(!newTopic)\r
+\r
+        if (!newTopic)\r
         {\r
             pthread_mutex_unlock(&NSCacheMutex);\r
             return NULL;\r
@@ -507,7 +511,7 @@ NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList)
         newTopic->next = NULL;\r
         newTopic->topicName = OICStrdup(curr->topicName);\r
 \r
-        if(!topics)\r
+        if (!topics)\r
         {\r
             iterTopic = topics = newTopic;\r
         }\r
@@ -534,7 +538,7 @@ NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList,
     pthread_mutex_lock(&NSCacheMutex);\r
     NSTopicLL * topics = NSProviderGetTopicsCacheData(regTopicList);\r
 \r
-    if(!topics)\r
+    if (!topics)\r
     {\r
         pthread_mutex_unlock(&NSCacheMutex);\r
         return NULL;\r
@@ -543,23 +547,24 @@ NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList,
     NSCacheElement * iter = conTopicList->head;\r
     conTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID;\r
 \r
-    while(iter)\r
+    while (iter)\r
     {\r
         NSCacheTopicSubData * curr = (NSCacheTopicSubData *)iter->data;\r
 \r
-        if(curr && strcmp(curr->id, consumerId) == 0)\r
+        if (curr && strcmp(curr->id, consumerId) == 0)\r
         {\r
             NS_LOG_V(DEBUG, "curr->id = %s", curr->id);\r
             NS_LOG_V(DEBUG, "curr->topicName = %s", curr->topicName);\r
-\r
             NSTopicLL * topicIter = topics;\r
-            while(topicIter)\r
+\r
+            while (topicIter)\r
             {\r
-                if(strcmp(topicIter->topicName, curr->topicName) == 0)\r
+                if (strcmp(topicIter->topicName, curr->topicName) == 0)\r
                 {\r
                     topicIter->state = NS_TOPIC_SUBSCRIBED;\r
                     break;\r
                 }\r
+\r
                 topicIter = topicIter->next;\r
             }\r
         }\r
@@ -578,22 +583,24 @@ bool NSProviderIsTopicSubScribed(NSCacheElement * conTopicList, char * cId, char
 {\r
     pthread_mutex_lock(&NSCacheMutex);\r
 \r
-    if(!conTopicList || !cId || !topicName)\r
+    if (!conTopicList || !cId || !topicName)\r
     {\r
         pthread_mutex_unlock(&NSCacheMutex);\r
         return false;\r
     }\r
 \r
     NSCacheElement * iter = conTopicList;\r
-    while(iter)\r
+\r
+    while (iter)\r
     {\r
         NSCacheTopicSubData * curr = (NSCacheTopicSubData *) iter->data;\r
 \r
-        if( (strcmp(curr->id, cId) == 0) && (strcmp(curr->topicName, topicName) == 0) )\r
+        if ( (strcmp(curr->id, cId) == 0) && (strcmp(curr->topicName, topicName) == 0) )\r
         {\r
             pthread_mutex_unlock(&NSCacheMutex);\r
             return true;\r
         }\r
+\r
         iter = iter->next;\r
     }\r
 \r
@@ -609,7 +616,7 @@ NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList,
     char * cId = topicSubData->id;\r
     char * topicName = topicSubData->topicName;\r
 \r
-    if(!conTopicList || !cId || !topicName)\r
+    if (!conTopicList || !cId || !topicName)\r
     {\r
         pthread_mutex_unlock(&NSCacheMutex);\r
         return NS_ERROR;\r
@@ -620,7 +627,7 @@ NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList,
 \r
     NSCacheType type = conTopicList->cacheType;\r
 \r
-    if(!del)\r
+    if (!del)\r
     {\r
         NS_LOG(DEBUG, "list head is NULL");\r
         pthread_mutex_unlock(&NSCacheMutex);\r
@@ -633,7 +640,7 @@ NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList,
     NS_LOG_V(DEBUG, "curr->id = %s", curr->id);\r
     NS_LOG_V(DEBUG, "curr->topicName = %s", curr->topicName);\r
 \r
-    if( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) &&\r
+    if ( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) &&\r
             (strcmp(curr->topicName, topicName) == 0) )\r
     {\r
         if (del == conTopicList->head) // first object\r
@@ -653,10 +660,11 @@ NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList,
 \r
     curr = NULL;\r
     del = del->next;\r
+\r
     while (del)\r
     {\r
         curr = (NSCacheTopicSubData *) del->data;\r
-        if( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) &&\r
+        if ( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) &&\r
                 (strcmp(curr->topicName, topicName) == 0) )\r
         {\r
             if (del == conTopicList->tail) // delete object same to last object\r
@@ -674,6 +682,7 @@ NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList,
         prev = del;\r
         del = del->next;\r
     }\r
+\r
     pthread_mutex_unlock(&NSCacheMutex);\r
     return NS_FAIL;\r
 }\r

diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c
index 269fe20..e84bebd 100644 (file)
--- a/service/notification/src/provider/NSProviderNotification.c
+++ b/service/notification/src/provider/NSProviderNotification.c
@@ -120,11 +120,11 @@ NSResult NSSendNotification(NSMessage *msg)
         {
             if(subData->messageObId != 0)
             {
-                if(msg->topic && (msg->topic)[0] != '\0')
+                if (msg->topic && (msg->topic)[0] != '\0')
                 {
                     NS_LOG_V(DEBUG, "this is topic message: %s", msg->topic);
 
-                    if(NSProviderIsTopicSubScribed(consumerTopicList->head, subData->id, msg->topic))
+                    if (NSProviderIsTopicSubScribed(consumerTopicList->head, subData->id, msg->topic))
                     {
                         obArray[obCount++] = subData->messageObId;
                     }
@@ -135,13 +135,13 @@ NSResult NSSendNotification(NSMessage *msg)
                 }
             }
 
-#if(defined WITH_CLOUD && defined RD_CLIENT)
-            if(subData->remote_messageObId != 0)
+#if (defined WITH_CLOUD && defined RD_CLIENT)
+            if (subData->remote_messageObId != 0)
             {
-                if(msg->topic && (msg->topic)[0] != '\0')
+                if (msg->topic && (msg->topic)[0] != '\0')
                 {
                     NS_LOG_V(DEBUG, "this is topic message via remote server: %s", msg->topic);
-                    if(NSProviderIsTopicSubScribed(consumerTopicList->head, subData->id, msg->topic))
+                    if (NSProviderIsTopicSubScribed(consumerTopicList->head, subData->id, msg->topic))
                     {
                         obArray[obCount++] = subData->remote_messageObId;
                     }
@@ -152,8 +152,8 @@ NSResult NSSendNotification(NSMessage *msg)
                 }
             }
 #endif
-
         }
+
         it = it->next;
     }
 
@@ -164,7 +164,7 @@ NSResult NSSendNotification(NSMessage *msg)
         NS_LOG(DEBUG, "-------------------------------------------------------message\n");
     }
 
-    if(!obCount)
+    if (!obCount)
     {
         NS_LOG(ERROR, "observer count is zero");
         return NS_ERROR;
@@ -219,13 +219,13 @@ NSResult NSSendSync(NSSyncInfo *sync)
 
         if (subData->isWhite)
         {
-            if(subData->syncObId != 0)
+            if (subData->syncObId != 0)
             {
                 obArray[obCount++] = subData->syncObId;
             }
 
-#if(defined WITH_CLOUD && defined RD_CLIENT)
-            if(subData->remote_syncObId != 0)
+#if (defined WITH_CLOUD && defined RD_CLIENT)
+            if (subData->remote_syncObId != 0)
             {
                 obArray[obCount++] = subData->remote_syncObId;
             }

diff --git a/service/notification/src/provider/NSProviderResource.c b/service/notification/src/provider/NSProviderResource.c
index 2520c01..7d0c979 100644 (file)
--- a/service/notification/src/provider/NSProviderResource.c
+++ b/service/notification/src/provider/NSProviderResource.c
@@ -27,14 +27,14 @@ NSMessageResource NotificationMessageResource;
 NSSyncResource NotificationSyncResource;
 NSTopicResource NotificationTopicResource;
 
-#if(defined WITH_CLOUD && defined RD_CLIENT)
+#if (defined WITH_CLOUD && defined RD_CLIENT)
 #define DEFAULT_CONTEXT_VALUE 0x99
 
 OCStackApplicationResult NSHandlePublishCb(void *ctx, OCDoHandle handle,
     OCClientResponse *clientResponse)
 {
     (void) handle;
-    if(ctx != (void *)DEFAULT_CONTEXT_VALUE)
+    if (ctx != (void *)DEFAULT_CONTEXT_VALUE)
     {
         NS_LOG(DEBUG, "Invalid Publish callback received");
     } 
@@ -55,7 +55,7 @@ NSResult NSPublishResourceToCloud(char *serverAddress)
     cbData.context = (void *)DEFAULT_CONTEXT_VALUE;
     cbData.cd = NULL;
 
-    OCResourceHandle resourceHandles[1] = {NotificationResource.handle};
+    OCResourceHandle resourceHandles[1] = { NotificationResource.handle };
     OCStackResult res = OCRDPublish(serverAddress, CT_ADAPTER_TCP, resourceHandles, 1,
             &cbData, OC_LOW_QOS);
 
@@ -91,7 +91,7 @@ NSResult NSCreateResource(char *uri)
         NotificationResource.version = VERSION;
         NotificationResource.handle = NULL;
 
-        if(NSGetResourceSecurity())
+        if (NSGetResourceSecurity())
         {
             NS_LOG(DEBUG, "Create secured resource");
             resourceProperties = OC_DISCOVERABLE | OC_SECURE;
@@ -131,7 +131,7 @@ NSResult NSCreateResource(char *uri)
         NotificationMessageResource.topicName = NULL;
         NotificationMessageResource.mediaContents = NULL;
 
-        if(NSGetResourceSecurity())
+        if (NSGetResourceSecurity())
         {
             NS_LOG(DEBUG, "Create secured resource");
             resourceProperties = OC_OBSERVABLE | OC_SECURE;
@@ -163,7 +163,7 @@ NSResult NSCreateResource(char *uri)
         NotificationSyncResource.state = NULL;
         NotificationSyncResource.handle = NULL;
 
-        if(NSGetResourceSecurity())
+        if (NSGetResourceSecurity())
         {
             NS_LOG(DEBUG, "Create secured resource");
             resourceProperties = OC_OBSERVABLE | OC_SECURE;
@@ -196,7 +196,7 @@ NSResult NSCreateResource(char *uri)
         NotificationTopicResource.TopicList = NULL;
         NotificationTopicResource.handle = NULL;
 
-        if(NSGetResourceSecurity())
+        if (NSGetResourceSecurity())
         {
             NS_LOG(DEBUG, "Create secured resource");
             resourceProperties = OC_RES_PROP_NONE | OC_SECURE;

diff --git a/service/notification/src/provider/NSProviderScheduler.c b/service/notification/src/provider/NSProviderScheduler.c
index fb49337..7803938 100755 (executable)
--- a/service/notification/src/provider/NSProviderScheduler.c
+++ b/service/notification/src/provider/NSProviderScheduler.c
@@ -150,7 +150,7 @@ bool NSStopScheduler()
 void NSPushQueue(NSSchedulerType schedulerType, NSTaskType taskType, void* data)\r
 {\r
 \r
-    if(!NSIsRunning[schedulerType])\r
+    if (!NSIsRunning[schedulerType])\r
     {\r
         return;\r
     }\r
@@ -164,7 +164,8 @@ void NSPushQueue(NSSchedulerType schedulerType, NSTaskType taskType, void* data)
     if (NSHeadMsg[schedulerType] == NULL)\r
     {\r
         NSHeadMsg[schedulerType] = (NSTask*) OICMalloc(sizeof(NSTask));\r
-        if(NSHeadMsg[schedulerType])\r
+\r
+        if (NSHeadMsg[schedulerType])\r
         {\r
             NSHeadMsg[schedulerType]->taskType = taskType;\r
             NSHeadMsg[schedulerType]->taskData = data;\r
@@ -175,7 +176,7 @@ void NSPushQueue(NSSchedulerType schedulerType, NSTaskType taskType, void* data)
     else\r
     {\r
         NSTask* newNode = (NSTask*) OICMalloc(sizeof(NSTask));\r
-        if(newNode)\r
+        if (newNode)\r
         {\r
             newNode->taskType = taskType;\r
             newNode->taskData = data;\r

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 321109d..6bfe3cd 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -89,6 +89,7 @@ NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest
         OCResourcePayloadAddStringLL(&payload->interfaces, NS_INTERFACE_READ);\r
         OCResourcePayloadAddStringLL(&payload->types, NS_ROOT_TYPE);\r
     }\r
+\r
     OICFree(copyReq);\r
     OCRepPayloadSetUri(payload, NS_ROOT_URI);\r
     OCRepPayloadSetPropString(payload, NS_ATTRIBUTE_PROVIDER_ID, NSGetProviderInfo()->providerId);\r
@@ -125,7 +126,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
     char * copyReq = OICStrdup(entityHandlerRequest->query);\r
     char * id = NSGetValueFromQuery(copyReq, NS_QUERY_CONSUMER_ID);\r
 \r
-    if(!id)\r
+    if (!id)\r
     {\r
         OICFree(copyReq);\r
         NSFreeOCEntityHandlerRequest(entityHandlerRequest);\r
@@ -153,7 +154,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
 \r
 #if(defined WITH_CLOUD && defined RD_CLIENT)\r
         iSRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr);\r
-        if(iSRemoteServer)\r
+        if (iSRemoteServer)\r
         {\r
             NS_LOG(DEBUG, "Requested by remote server");\r
             subData->remote_messageObId = entityHandlerRequest->obsInfo.obsId;\r
@@ -161,7 +162,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         }\r
 #endif\r
 \r
-        if(!iSRemoteServer)\r
+        if (!iSRemoteServer)\r
         {\r
             NS_LOG(DEBUG, "Requested by local consumer");\r
             subData->messageObId = entityHandlerRequest->obsInfo.obsId;\r
@@ -209,9 +210,9 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         subData->remote_syncObId = subData->syncObId = 0;\r
         bool isRemoteServer = false;\r
 \r
-#if(defined WITH_CLOUD && defined RD_CLIENT)\r
+#if (defined WITH_CLOUD && defined RD_CLIENT)\r
         isRemoteServer = NSIsRemoteServerAddress(entityHandlerRequest->devAddr.addr);\r
-        if(isRemoteServer)\r
+        if (isRemoteServer)\r
         {\r
             NS_LOG(DEBUG, "Requested by remote server");\r
             subData->remote_syncObId = entityHandlerRequest->obsInfo.obsId;\r
@@ -219,7 +220,7 @@ void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResour
         }\r
 #endif\r
 \r
-        if(!isRemoteServer)\r
+        if (!isRemoteServer)\r
         {\r
             NS_LOG(DEBUG, "Requested by local consumer");\r
             subData->syncObId = entityHandlerRequest->obsInfo.obsId;\r
@@ -251,12 +252,11 @@ void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest)
 \r
     consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER_OBSERVE_ID;\r
 \r
-    while(NSProviderStorageDelete(consumerSubList, (char *)\r
+    while (NSProviderStorageDelete(consumerSubList, (char *)\r
             &(entityHandlerRequest->obsInfo.obsId)) != NS_FAIL);\r
-    consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER;\r
 \r
+    consumerSubList->cacheType = NS_PROVIDER_CACHE_SUBSCRIBER;\r
     NSFreeOCEntityHandlerRequest(entityHandlerRequest);\r
-\r
     NS_LOG(DEBUG, "NSHandleUnsubscription - OUT");\r
 }\r
 \r
@@ -294,11 +294,12 @@ NSResult NSSendResponse(const char * id, bool accepted)
 \r
     NSCacheElement * element = NSProviderStorageRead(consumerSubList, id);\r
 \r
-    if(element == NULL)\r
+    if (element == NULL)\r
     {\r
         NS_LOG(ERROR, "element is NULL");\r
         return NS_ERROR;\r
     }\r
+\r
     NSCacheSubData * subData = (NSCacheSubData*) element->data;\r
 \r
     if (OCNotifyListOfObservers(rHandle, (OCObservationId*)&subData->messageObId, 1,\r
@@ -309,8 +310,8 @@ NSResult NSSendResponse(const char * id, bool accepted)
         return NS_ERROR;\r
 \r
     }\r
-    OCRepPayloadDestroy(payload);\r
 \r
+    OCRepPayloadDestroy(payload);\r
     NS_LOG(DEBUG, "NSSendResponse - OUT");\r
     return NS_OK;\r
 }\r
@@ -328,7 +329,7 @@ NSResult NSSendConsumerSubResponse(OCEntityHandlerRequest * entityHandlerRequest
     char * copyReq = OICStrdup(entityHandlerRequest->query);\r
     char * id = NSGetValueFromQuery(copyReq, NS_QUERY_CONSUMER_ID);\r
 \r
-    if(!id)\r
+    if (!id)\r
     {\r
         OICFree(copyReq);\r
         NSFreeOCEntityHandlerRequest(entityHandlerRequest);\r

diff --git a/service/notification/src/provider/NSProviderSystem.c b/service/notification/src/provider/NSProviderSystem.c
index b8181bc..5949350 100644 (file)
--- a/service/notification/src/provider/NSProviderSystem.c
+++ b/service/notification/src/provider/NSProviderSystem.c
@@ -19,7 +19,7 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
 #include "NSProviderSystem.h"\r
 \r
-#if(defined WITH_CLOUD && defined RD_CLIENT)\r
+#if (defined WITH_CLOUD && defined RD_CLIENT)\r
 #define MAX_SERVER_ADDRESS 32\r
 static char NSRemoteServerAddress[MAX_SERVER_ADDRESS] = {0,};\r
 #endif\r
@@ -44,7 +44,7 @@ NSConnectionState NSGetProviderConnectionState()
     return NSProviderConnectionState;\r
 }\r
 \r
-#if(defined WITH_CLOUD && defined RD_CLIENT)\r
+#if (defined WITH_CLOUD && defined RD_CLIENT)\r
 void NSSetRemoteServerAddress(char *serverAddress)\r
 {\r
 \r
@@ -62,7 +62,7 @@ bool NSIsRemoteServerAddress(char *serverAddress)
 {\r
     NS_LOG_V(DEBUG, "Check server address: %s", serverAddress);\r
 \r
-    if(serverAddress != NULL)\r
+    if (serverAddress != NULL)\r
     {\r
         return strstr(NSRemoteServerAddress, serverAddress);\r
     }\r
@@ -83,27 +83,29 @@ void NSInitProviderInfo(const char * userInfo)
     providerInfo->providerName = NULL;\r
     providerInfo->userInfo = NULL;\r
 \r
-    if(userInfo)\r
+    if (userInfo)\r
+    {\r
         providerInfo->userInfo = OICStrdup(userInfo);\r
+    }\r
 }\r
 \r
 void NSDeinitProviderInfo()\r
 {\r
     NS_LOG(DEBUG, "NSDeinitProviderInfo");\r
 \r
-    if(!providerInfo)\r
+    if (!providerInfo)\r
     {\r
         NS_LOG(DEBUG, "providerInfo is NULL");\r
         return;\r
     }\r
 \r
-    if(providerInfo->providerName)\r
+    if (providerInfo->providerName)\r
     {\r
         OICFree(providerInfo->providerName);\r
         providerInfo->providerName = NULL;\r
     }\r
 \r
-    if(providerInfo->userInfo)\r
+    if (providerInfo->userInfo)\r
     {\r
         OICFree(providerInfo->userInfo);\r
         providerInfo->userInfo = NULL;\r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index bd23e91..389ef25 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -77,16 +77,17 @@ NSResult NSRegisterTopic(const char * topicName)
         OICFree(data);\r
         return NS_FAIL;\r
     }\r
+\r
     element->data = (void *) data;\r
     element->next = NULL;\r
 \r
-    if(NSProviderStorageWrite(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
     }\r
-    NSSendTopicUpdation();\r
 \r
+    NSSendTopicUpdation();\r
     NS_LOG(DEBUG, "NSWriteTopicsToStorage() NS_OK");\r
     return NS_OK;\r
 }\r
@@ -103,6 +104,7 @@ NSResult NSUnregisterTopic(const char * topicName)
     }\r
 \r
     result = NSProviderStorageDelete(registeredTopicList, topicName);\r
+\r
     while (NSProviderStorageDelete(consumerTopicList, topicName) != NS_FAIL)\r
     {\r
     }\r
@@ -155,13 +157,14 @@ NSResult NSSendTopicUpdation()
                 obArray[obCount++] = subData->messageObId;\r
             }\r
 \r
-#if(defined WITH_CLOUD && defined RD_CLIENT)\r
-            if(subData->remote_messageObId != 0)\r
+#if (defined WITH_CLOUD && defined RD_CLIENT)\r
+            if (subData->remote_messageObId != 0)\r
             {\r
                 obArray[obCount++] = subData->remote_messageObId;\r
             }\r
 #endif\r
         }\r
+\r
         it = it->next;\r
     }\r
 \r
@@ -337,8 +340,8 @@ NSResult NSSendTopicList(OCEntityHandlerRequest * entityHandlerRequest)
         OCResourcePayloadAddStringLL(&payload->interfaces, NS_INTERFACE_READ);\r
         OCResourcePayloadAddStringLL(&payload->types, NS_ROOT_TYPE);\r
     }\r
-    OICFree(copyReq);\r
 \r
+    OICFree(copyReq);\r
     response.requestHandle = entityHandlerRequest->requestHandle;\r
     response.resourceHandle = entityHandlerRequest->resource;\r
     response.persistentBufferFlag = 0;\r
@@ -378,8 +381,8 @@ NSResult NSPostConsumerTopics(OCEntityHandlerRequest * entityHandlerRequest)
     while (NSProviderStorageDelete(consumerTopicList, consumerId) != NS_FAIL)\r
     {\r
     }\r
-    consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME;\r
 \r
+    consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME;\r
     OCRepPayload ** topicListPayload = NULL;\r
     OCRepPayloadValue * payloadValue = NULL;\r
     payloadValue = NSPayloadFindValue(payload, NS_ATTRIBUTE_TOPIC_LIST);\r
@@ -472,7 +475,8 @@ void * NSTopicSchedule(void * ptr)
                         {\r
                             newObj->data = topicSyncResult->topicData;\r
                             newObj->next = NULL;\r
-                            if(NSProviderStorageWrite(consumerTopicList, newObj) == NS_OK)\r
+\r
+                            if (NSProviderStorageWrite(consumerTopicList, newObj) == NS_OK)\r
                             {\r
                                 NSSendTopicUpdationToConsumer(subData->id);\r
                                 topicSyncResult->result = NS_OK;\r
@@ -496,11 +500,13 @@ void * NSTopicSchedule(void * ptr)
                     pthread_mutex_lock(topicSyncResult->mutex);\r
                     NSCacheTopicSubData * topicSubData =\r
                             (NSCacheTopicSubData *) topicSyncResult->topicData;\r
+\r
                     if (NSProviderDeleteConsumerTopic(consumerTopicList, topicSubData) == NS_OK)\r
                     {\r
                         NSSendTopicUpdationToConsumer(topicSubData->id);\r
                         topicSyncResult->result = NS_OK;\r
                     }\r
+\r
                     OICFree(topicSubData->topicName);\r
                     OICFree(topicSubData);\r
                     pthread_cond_signal(topicSyncResult->condition);\r