Reduce false defects reported by prevent.

[Issue#]   N/A
[Bug]      N/A
[Problem]  N/A
[Solution] N/A

[Verification] Build.

Change-Id: I13bd90c0815caf6018824359d203afee8e4ca1f2

diff --git a/src/server2/dpl/log/include/dpl/log/abstract_log_provider.h b/src/server2/dpl/log/include/dpl/log/abstract_log_provider.h
index 312d416..f94ec33 100644 (file)
--- a/src/server2/dpl/log/include/dpl/log/abstract_log_provider.h
+++ b/src/server2/dpl/log/include/dpl/log/abstract_log_provider.h
@@ -29,6 +29,8 @@ class AbstractLogProvider
   public:
     virtual ~AbstractLogProvider() {}
 
+    virtual void SetTag(const char *tag);
+
     virtual void Debug(const char *message,
                        const char *fileName,
                        int line,

diff --git a/src/server2/dpl/log/include/dpl/log/log.h b/src/server2/dpl/log/include/dpl/log/log.h
index 0fee222..ca84108 100644 (file)
--- a/src/server2/dpl/log/include/dpl/log/log.h
+++ b/src/server2/dpl/log/include/dpl/log/log.h
@@ -25,8 +25,6 @@
 #include <dpl/singleton.h>
 #include <dpl/noncopyable.h>
 #include <dpl/log/abstract_log_provider.h>
-#include <dpl/log/dlog_log_provider.h>
-#include <dpl/log/old_style_log_provider.h>
 #include <sstream>
 #include <list>
 
@@ -45,9 +43,6 @@ class LogSystem :
     typedef std::list<AbstractLogProvider *> AbstractLogProviderPtrList;
     AbstractLogProviderPtrList m_providers;
 
-    DLOGLogProvider *m_dlogProvider;
-    OldStyleLogProvider *m_oldStyleProvider;
-
     bool m_isLoggingEnabled;
 
   public:

diff --git a/src/server2/dpl/log/src/abstract_log_provider.cpp b/src/server2/dpl/log/src/abstract_log_provider.cpp
index 43025fd..1da7bba 100644 (file)
--- a/src/server2/dpl/log/src/abstract_log_provider.cpp
+++ b/src/server2/dpl/log/src/abstract_log_provider.cpp
@@ -23,8 +23,13 @@
 #include <dpl/log/abstract_log_provider.h>
 #include <cstring>
 
+#define UNUSED __attribute__((unused))
+
 namespace SecurityServer {
 namespace Log {
+
+void AbstractLogProvider::SetTag(const char *tag UNUSED) {}
+
 const char *AbstractLogProvider::LocateSourceFileName(const char *filename)
 {
     const char *ptr = strrchr(filename, '/');

diff --git a/src/server2/dpl/log/src/log.cpp b/src/server2/dpl/log/src/log.cpp
index 5903e4c..98fe7f6 100644 (file)
--- a/src/server2/dpl/log/src/log.cpp
+++ b/src/server2/dpl/log/src/log.cpp
@@ -24,6 +24,8 @@
 
 #include <dpl/log/log.h>
 #include <dpl/singleton_impl.h>
+#include <dpl/log/dlog_log_provider.h>
+#include <dpl/log/old_style_log_provider.h>
 
 IMPLEMENT_SINGLETON(SecurityServer::Log::LogSystem)
 
@@ -46,8 +48,6 @@ bool LogSystem::IsLoggingEnabled() const
 }
 
 LogSystem::LogSystem() :
-    m_dlogProvider(NULL),
-    m_oldStyleProvider(NULL),
     m_isLoggingEnabled(!getenv(SECURITY_SERVER_LOG_OFF))
 {
 #ifdef BUILD_TYPE_DEBUG
@@ -112,20 +112,17 @@ LogSystem::LogSystem() :
     // Setup default DLOG and old style logging
     if (oldStyleLogs) {
         // Old style
-        m_oldStyleProvider = new OldStyleLogProvider(oldStyleDebugLogs,
-                                                     oldStyleInfoLogs,
-                                                     oldStyleWarningLogs,
-                                                     oldStyleErrorLogs,
-                                                     oldStylePedanticLogs);
-        AddProvider(m_oldStyleProvider);
+        AddProvider(new OldStyleLogProvider(oldStyleDebugLogs,
+                                            oldStyleInfoLogs,
+                                            oldStyleWarningLogs,
+                                            oldStyleErrorLogs,
+                                            oldStylePedanticLogs));
     } else {
         // DLOG
-        m_dlogProvider = new DLOGLogProvider();
-        AddProvider(m_dlogProvider);
+        AddProvider(new DLOGLogProvider());
     }
 #else // BUILD_TYPE_DEBUG
-    m_dlogProvider = new DLOGLogProvider();
-    AddProvider(m_dlogProvider);
+    AddProvider(new DLOGLogProvider());
 #endif // BUILD_TYPE_DEBUG
 }
 
@@ -140,16 +137,15 @@ LogSystem::~LogSystem()
     }
 
     m_providers.clear();
-
-    // And even default providers
-    m_dlogProvider = NULL;
-    m_oldStyleProvider = NULL;
 }
 
 void LogSystem::SetTag(const char* tag)
 {
-    if (m_dlogProvider != NULL) {
-        m_dlogProvider->SetTag(tag);
+    for (AbstractLogProviderPtrList::iterator iterator = m_providers.begin();
+         iterator != m_providers.end();
+         ++iterator)
+    {
+        (*iterator)->SetTag(tag);
     }
 }