Remove logs with non-LOGGING build option.

When notification service build on non-Logging mode, log is removed.
For the above reason, newly appeared warning is resolved.

Change-Id: Ibc7a1ee32e3063934ad5fccdaf363707ef5a247c
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11621
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
index 1399e70..ec11649 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSConsumerService.cpp
@@ -223,6 +223,7 @@ namespace OIC
             result = (NSResult) NSConsumerEnableRemoteService(OICStrdup(serverAddress.c_str()));\r
 #else\r
             NS_LOG(ERROR, "Remote Services feature is not enabled in the Build");\r
+            (void) serverAddress;\r
 #endif\r
             NS_LOG(DEBUG, "enableRemoteService - OUT");\r
             return result;\r

diff --git a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
index efce8e5..648f9c6 100755 (executable)
--- a/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
+++ b/service/notification/cpp-wrapper/consumer/src/NSProvider.cpp
@@ -112,11 +112,11 @@ namespace OIC
             NS_LOG(DEBUG, "updateTopicList - IN");\r
             if (topicList == nullptr)\r
                 return NSResult::ERROR;\r
-            for (auto it : topicList->getTopicsList())\r
-            {\r
-                NS_LOG_V(DEBUG, "Topic Name : %s", it->getTopicName().c_str());\r
-                NS_LOG_V(DEBUG, "Topic State : %d", (int) it->getState());\r
-            }\r
+//            for (auto it : topicList->getTopicsList())\r
+//            {\r
+//                NS_LOG_V(DEBUG, "Topic Name : %s", it->getTopicName().c_str());\r
+//                NS_LOG_V(DEBUG, "Topic State : %d", (int) it->getState());\r
+//            }\r
             NS_LOG(DEBUG, "Creating TopicLL from TopicList");\r
             NSTopicLL *topicLL = NULL;\r
             for (auto it : topicList->getTopicsList())\r

diff --git a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
index 4e943ae..8b1364b 100755 (executable)
--- a/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
+++ b/service/notification/cpp-wrapper/provider/src/NSProviderService.cpp
@@ -127,6 +127,7 @@ namespace OIC
 #ifdef WITH_CLOUD\r
             result = (NSResult) NSProviderEnableRemoteService(OICStrdup(serverAddress.c_str()));\r
 #else\r
+            (void) serverAddress;\r
             NS_LOG(ERROR, "Remote Services feature is not enabled in the Build");\r
 #endif\r
             NS_LOG(DEBUG, "enableRemoteService - OUT");\r
@@ -141,6 +142,7 @@ namespace OIC
 #ifdef WITH_CLOUD\r
             result = (NSResult) NSProviderDisableRemoteService(OICStrdup(serverAddress.c_str()));\r
 #else\r
+            (void) serverAddress;\r
             NS_LOG(ERROR, "Remote Services feature is not enabled in the Build");\r
 #endif\r
             NS_LOG(DEBUG, "disableRemoteService - OUT");\r
@@ -161,7 +163,9 @@ namespace OIC
                 delete nsMsg;\r
             }\r
             else\r
+            {\r
                 NS_LOG(DEBUG, "Empty Message");\r
+            }\r
             NS_LOG(DEBUG, "sendMessage - OUT");\r
             return result;\r
         }\r

diff --git a/service/notification/src/common/NSConstants.h b/service/notification/src/common/NSConstants.h
index e7d6160..38cca0a 100644 (file)
--- a/service/notification/src/common/NSConstants.h
+++ b/service/notification/src/common/NSConstants.h
@@ -21,6 +21,7 @@
 #ifndef _NS_CONSTANTS_H_
 #define _NS_CONSTANTS_H_
 
+#define __PRINTLOG 0
 #define __NS_FILE__ ( strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__ )
 
 #ifdef TB_LOG
@@ -28,6 +29,7 @@
 #define NS_LOG_V(level, format, ...) (OIC_LOG_V((level), __NS_FILE__, (format), __VA_ARGS__))
 #define NS_LOG(level, msg) (OIC_LOG((level), __NS_FILE__, (msg)))
 #else
+#if (__PRINTLOG == 1)
 #include "logger.h"
 #define NS_CONVERT_LEVEL(level) ( \
         ((level) == 0) ? "DEBUG" : \
@@ -46,6 +48,11 @@
         printf((msg)); \
         printf("\n"); \
     }
+#else
+#define NS_CONVERT_LEVEL(level)
+#define NS_LOG(level, msg)
+#define NS_LOG_V(level, format, ...) NS_LOG((level), ((format), __VA_ARGS__))
+#endif
 #endif
 
 #define NS_TAG                     "IOT_NOTI"

diff --git a/service/notification/src/consumer/NSConsumerMemoryCache.c b/service/notification/src/consumer/NSConsumerMemoryCache.c
index f3dff6a..f06f918 100644 (file)
--- a/service/notification/src/consumer/NSConsumerMemoryCache.c
+++ b/service/notification/src/consumer/NSConsumerMemoryCache.c
@@ -205,11 +205,6 @@ NSResult NSConsumerCacheWriteProvider(NSCacheList * list, NSCacheElement * newOb
 
     pthread_mutex_t * mutex = NSGetCacheMutex();
 
-    NS_LOG (DEBUG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1");
-    NSProvider_internal * prov = (NSProvider_internal *)newObj->data;
-    NS_LOG_V (DEBUG, "%s", prov->providerId);
-    NS_LOG (DEBUG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1");
-
     NSProvider_internal * newProvObj = (NSProvider_internal *) newObj->data;
 
     NSCacheElement * it = NSStorageRead(list, newProvObj->providerId);
@@ -250,11 +245,6 @@ NSResult NSConsumerCacheWriteProvider(NSCacheList * list, NSCacheElement * newOb
     NS_LOG_V(DEBUG, "New Object address : %s:%d", newProvObj->connection->addr->addr, newProvObj->connection->addr->port);
     obj->data = (void *) NSCopyProvider_internal(newProvObj);
 
-    NS_LOG (DEBUG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2");
-    prov = (NSProvider_internal *)obj->data;
-    NS_LOG_V (DEBUG, "%s", prov->providerId);
-    NS_LOG (DEBUG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!2");
-
     if (!obj->data)
     {
         NS_LOG (ERROR, "Failed to CopyProvider");
@@ -269,11 +259,6 @@ NSResult NSConsumerCacheWriteProvider(NSCacheList * list, NSCacheElement * newOb
         list->head = obj;
         list->tail = obj;
 
-        NS_LOG (DEBUG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3");
-        prov = (NSProvider_internal *)list->tail->data;
-        NS_LOG_V (DEBUG, "%s", prov->providerId);
-        NS_LOG (DEBUG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!3");
-
         pthread_mutex_unlock(mutex);
 
         return NS_OK;
@@ -282,11 +267,6 @@ NSResult NSConsumerCacheWriteProvider(NSCacheList * list, NSCacheElement * newOb
     (list->tail)->next = obj;
     list->tail = obj;
 
-    NS_LOG (DEBUG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4");
-    prov = (NSProvider_internal *)list->tail->data;
-    NS_LOG_V (DEBUG, "%s", prov->providerId);
-    NS_LOG (DEBUG, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!4");
-
     pthread_mutex_unlock(mutex);
 
     return NS_OK;

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c
index 6472452..71fcab4 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProviderInterface.c
@@ -148,6 +148,8 @@ NSResult NSProviderEnableRemoteService(char *serverAddress)
     pthread_mutex_unlock(&nsInitMutex);
     NS_LOG(DEBUG, "NSProviderEnableRemoteService - OUT");
     return NS_OK;
+#else
+    (void) serverAddress;
 #endif
     NS_LOG_V(DEBUG, "Not logged in remote server: %s", serverAddress);
     return NS_FAIL;
@@ -172,6 +174,8 @@ NSResult NSProviderDisableRemoteService(char *serverAddress)
     pthread_mutex_unlock(&nsInitMutex);
     NS_LOG(DEBUG, "NSProviderDisableRemoteService - OUT");
     return NS_OK;
+#else
+    (void) serverAddress;
 #endif
     NS_LOG_V(DEBUG, "Not logged in remote server : %s", serverAddress);
     return NS_FAIL;