Use dlog instead of printf

Change-Id: Id18b4b333e964abf266050ae38ea18a839c27a22
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/framework/CsrLog.h b/framework/CsrLog.h
new file mode 100644 (file)
index 0000000..181b53b
--- /dev/null
+++ b/framework/CsrLog.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ *
+ * @file        CsrLog.h
+ * @author      Kyungwook Tak (k.tak@samsung.com)
+ * @version     1.0
+ * @brief       CSR framework log wrapper of dlog
+ */
+#ifndef _CSR_LOG_H_
+#define _CSR_LOG_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif
+#define LOG_TAG "CSR_FRAMEWORK"
+
+#include <dlog.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* _CSR_LOG_H */

diff --git a/framework/TCSImpl.c b/framework/TCSImpl.c
index b59b3b1..d01fd69 100644 (file)
--- a/framework/TCSImpl.c
+++ b/framework/TCSImpl.c
@@ -36,21 +36,12 @@
 
 #include <tzplatform_config.h>
 
+#include "CsrLog.h"
 #include "TCSImpl.h"
 #include "TCSErrorCodes.h"
 
 
 #define TCS_CONSTRUCT_ERRCODE(m, e) (((m) << 24) | (e))
-
-#if defined(DEBUG)
-#define DEBUG_LOG(_fmt_, _param_...)    { \
-                                            printf("[TCS] %s,%d: " _fmt_, __FILE__, __LINE__, ##_param_); \
-                                        }
-#else
-#define DEBUG_LOG(_fmt_, _param_...)
-#endif
-
-
 #define PLUGIN_PATH tzplatform_mkpath(TZ_USER_SHARE, "sec_plugin/libengine.so")
 
 
@@ -81,7 +72,7 @@ TCSLIB_HANDLE TCSLibraryOpen(void)
 {
     PluginContext *pCtx = NULL;
 
-    DEBUG_LOG("%s", "tcs lib open\n");
+    SLOGD("%s", "tcs lib open\n");
     pCtx = LoadPlugin();
     if (pCtx != NULL)
     {
@@ -90,11 +81,11 @@ TCSLIB_HANDLE TCSLibraryOpen(void)
             free(pCtx);
             return INVALID_TCSLIB_HANDLE;
         }
-        DEBUG_LOG("%s", "call to TCSPLibraryOpen\n");
+        SLOGD("%s", "call to TCSPLibraryOpen\n");
         pCtx->hLib = (*pCtx->pfLibraryOpen)();
         if (pCtx->hLib == INVALID_TCSLIB_HANDLE)
         {
-            DEBUG_LOG("%s", "failed to open engine\n");
+            SLOGD("%s", "failed to open engine\n");
             if (pCtx->pPlugin != NULL)
                 dlclose(pCtx->pPlugin);
             free(pCtx);
@@ -172,7 +163,7 @@ static PluginContext *LoadPlugin(void)
 {
     PluginContext *pCtx = NULL;
     void *pTmp = dlopen(PLUGIN_PATH, RTLD_LAZY);
-    DEBUG_LOG("%s", "load plugin\n");
+    SLOGD("load plugin");
     if (pTmp != NULL)
     {
         FuncLibraryOpen TmpLibraryOpen;
@@ -184,10 +175,10 @@ static PluginContext *LoadPlugin(void)
         do
         {
             TmpLibraryOpen = dlsym(pTmp, "TCSPLibraryOpen");
-            DEBUG_LOG("%s", "load api TCSPLibraryOpen\n");
+            SLOGD("load api TCSPLibraryOpen");
             if (TmpLibraryOpen == NULL)
             {
-                DEBUG_LOG("Failed to load TCSPLibraryOpen in %s\n", PLUGIN_PATH);
+                SLOGE("Failed to load TCSPLibraryOpen in %s", PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
@@ -195,7 +186,7 @@ static PluginContext *LoadPlugin(void)
             TmpLibraryClose = dlsym(pTmp, "TCSPLibraryClose");
             if (TmpLibraryClose == NULL)
             {
-                DEBUG_LOG("Failed to load TCSPLibraryClose in %s\n", PLUGIN_PATH);
+                SLOGE("Failed to load TCSPLibraryClose in %s", PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
@@ -203,7 +194,7 @@ static PluginContext *LoadPlugin(void)
             TmpGetLastError = dlsym(pTmp, "TCSPGetLastError");
             if (TmpGetLastError == NULL)
             {
-                DEBUG_LOG("Failed to load TCSPGetLastError in %s\n", PLUGIN_PATH);
+                SLOGE("Failed to load TCSPGetLastError in %s", PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
@@ -211,7 +202,7 @@ static PluginContext *LoadPlugin(void)
             TmpScanData = dlsym(pTmp, "TCSPScanData");
             if (TmpScanData == NULL)
             {
-                DEBUG_LOG("Failed to load TCSPScanData in %s\n", PLUGIN_PATH);
+                SLOGE("Failed to load TCSPScanData in %s", PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
@@ -219,7 +210,7 @@ static PluginContext *LoadPlugin(void)
             TmpScanFile = dlsym(pTmp, "TCSPScanFile");
             if (TmpScanFile == NULL)
             {
-                DEBUG_LOG("Failed to load TCSPScanFile in %s\n", PLUGIN_PATH);
+                SLOGE("Failed to load TCSPScanFile in %s", PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
@@ -240,7 +231,7 @@ static PluginContext *LoadPlugin(void)
     }
     else
     {
-        DEBUG_LOG("No plugin found.\n");
+        SLOGE("No plugin found.");
     }
 
     return pCtx;

diff --git a/framework/TWPImpl.c b/framework/TWPImpl.c
index bd4ddb5..f945f67 100644 (file)
--- a/framework/TWPImpl.c
+++ b/framework/TWPImpl.c
@@ -36,19 +36,12 @@
 
 #include <tzplatform_config.h>
 
+#include "CsrLog.h"
 #include "TWPImpl.h"
 
 
 #define SITE_PLUGIN_PATH tzplatform_mkpath(TZ_USER_SHARE, "sec_plugin/libwpengine.so")
 
-#if defined(DEBUG)
-#define DEBUG_LOG(_fmt_, _param_...)    { \
-                                            printf("[TCS] %s,%d: " _fmt_, __FILE__, __LINE__, ##_param_); \
-                                        }
-#else
-#define DEBUG_LOG(_fmt_, _param_...)
-#endif
-
 
 typedef TWP_RESULT (*FuncInitLibrary)(TWPAPIInit *pApiInit);
 typedef void (*FuncUninitLibrary)(void);
@@ -338,7 +331,7 @@ static SitePluginContext *LoadPlugin(void)
 {
     SitePluginContext *pCtx = NULL;
     void *pTmp = dlopen(SITE_PLUGIN_PATH, RTLD_LAZY);
-    DEBUG_LOG("%s", "load site plugin\n");
+    SLOGD("load site plugin");
     if (pTmp != NULL)
     {
         FuncUninitLibrary TmpUninitLibrary;
@@ -365,181 +358,181 @@ static SitePluginContext *LoadPlugin(void)
         do
         {
             TmpInitLibrary = dlsym(pTmp, "TWPPInitLibrary");
-            DEBUG_LOG("%s", "load api TWPPInitLibrary\n");
+            SLOGD("load api TWPPInitLibrary");
             if (TmpInitLibrary == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPInitLibrary in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPInitLibrary in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpUninitLibrary = dlsym(pTmp, "TWPPUninitLibrary");
-            DEBUG_LOG("%s", "load api TWPPUninitLibrary\n");
+            SLOGD("load api TWPPUninitLibrary");
             if (TmpUninitLibrary == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPUninitLibrary in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPUninitLibrary in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpConfigurationCreate = dlsym(pTmp, "TWPPConfigurationCreate");
-            DEBUG_LOG("%s", "load api TWPPConfigurationCreate\n");
+            SLOGD("load api TWPPConfigurationCreate");
             if (TmpConfigurationCreate == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPConfigurationCreate in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPConfigurationCreate in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpConfigurationDestroy = dlsym(pTmp, "TWPPConfigurationDestroy");
-            DEBUG_LOG("%s", "load api TWPPConfigurationDestroy\n");
+            SLOGD("load api TWPPConfigurationDestroy");
             if (TmpConfigurationDestroy == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPConfigurationDestroy in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPConfigurationDestroy in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpLookupUrls = dlsym(pTmp, "TWPPLookupUrls");
-            DEBUG_LOG("%s", "load api TWPPLookupUrls\n");
+            SLOGD("load api TWPPLookupUrls");
             if (TmpLookupUrls == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPLookupUrls in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPLookupUrls in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpResponseWrite = dlsym(pTmp, "TWPPResponseWrite");
-            DEBUG_LOG("%s", "load api TWPPResponseWrite\n");
+            SLOGD("load api TWPPResponseWrite");
             if (TmpResponseWrite == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPResponseWrite in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPResponseWrite in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpResponseGetUrlRatingByIndex = dlsym(pTmp, "TWPPResponseGetUrlRatingByIndex");
-            DEBUG_LOG("%s", "load api TWPPResponseGetUrlRatingByIndex\n");
+            SLOGD("load api TWPPResponseGetUrlRatingByIndex");
             if (TmpResponseGetUrlRatingByIndex == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPResponseGetUrlRatingByIndex in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPResponseGetUrlRatingByIndex in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpResponseGetUrlRatingByUrl = dlsym(pTmp, "TWPPResponseGetUrlRatingByUrl");
-            DEBUG_LOG("%s", "load api TWPPResponseGetUrlRatingByUrl\n");
+            SLOGD("load api TWPPResponseGetUrlRatingByUrl");
             if (TmpResponseGetUrlRatingByUrl == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPResponseGetUrlRatingByUrl in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPResponseGetUrlRatingByUrl in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpResponseGetRedirUrlFor = dlsym(pTmp, "TWPPResponseGetRedirUrlFor");
-            DEBUG_LOG("%s", "load api TWPPResponseGetRedirUrlFor\n");
+            SLOGD("load api TWPPResponseGetRedirUrlFor");
             if (TmpResponseGetRedirUrlFor == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPResponseGetRedirUrlFor in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPResponseGetRedirUrlFor in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpResponseGetUrlRatingsCount = dlsym(pTmp, "TWPPResponseGetUrlRatingsCount");
-            DEBUG_LOG("%s", "load api TWPPResponseGetUrlRatingsCount\n");
+            SLOGD("load api TWPPResponseGetUrlRatingsCount");
             if (TmpResponseGetUrlRatingsCount == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPResponseGetUrlRatingsCount in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPResponseGetUrlRatingsCount in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpResponseDestroy = dlsym(pTmp, "TWPPResponseDestroy");
-            DEBUG_LOG("%s", "load api TWPPResponseDestroy\n");
+            SLOGD("load api TWPPResponseDestroy");
             if (TmpResponseDestroy == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPResponseDestroy in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPResponseDestroy in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpPolicyCreate = dlsym(pTmp, "TWPPPolicyCreate");
-            DEBUG_LOG("%s", "load api TWPPPolicyCreate\n");
+            SLOGD("load api TWPPPolicyCreate");
             if (TmpPolicyCreate == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPPolicyCreate in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPPolicyCreate in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpPolicyValidate = dlsym(pTmp, "TWPPPolicyValidate");
-            DEBUG_LOG("%s", "load api TWPPPolicyValidate\n");
+            SLOGD("load api TWPPPolicyValidate");
             if (TmpPolicyValidate == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPPolicyValidate in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPPolicyValidate in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpPolicyGetViolations = dlsym(pTmp, "TWPPPolicyGetViolations");
-            DEBUG_LOG("%s", "load api TWPPPolicyGetViolations\n");
+            SLOGD("load api TWPPPolicyGetViolations");
             if (TmpPolicyGetViolations == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPPolicyGetViolations in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPPolicyGetViolations in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpPolicyDestroy = dlsym(pTmp, "TWPPPolicyDestroy");
-            DEBUG_LOG("%s", "load api TWPPPolicyDestroy\n");
+            SLOGD("load api TWPPPolicyDestroy");
             if (TmpPolicyDestroy == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPPolicyDestroy in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPPolicyDestroy in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpUrlRatingGetScore = dlsym(pTmp, "TWPPUrlRatingGetScore");
-            DEBUG_LOG("%s", "load api TWPPUrlRatingGetScore\n");
+            SLOGD("load api TWPPUrlRatingGetScore");
             if (TmpUrlRatingGetScore == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPUrlRatingGetScore in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPUrlRatingGetScore in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpUrlRatingGetUrl = dlsym(pTmp, "TWPPUrlRatingGetUrl");
-            DEBUG_LOG("%s", "load api TWPPUrlRatingGetUrl\n");
+            SLOGD("load api TWPPUrlRatingGetUrl");
             if (TmpUrlRatingGetUrl == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPUrlRatingGetUrl in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPUrlRatingGetUrl in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpUrlRatingGetDLAUrl = dlsym(pTmp, "TWPPUrlRatingGetDLAUrl");
-            DEBUG_LOG("%s", "load api TWPPUrlRatingGetDLAUrl\n");
+            SLOGD("load api TWPPUrlRatingGetDLAUrl");
             if (TmpUrlRatingGetDLAUrl == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPUrlRatingGetDLAUrl in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPUrlRatingGetDLAUrl in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpUrlRatingHasCategory = dlsym(pTmp, "TWPPUrlRatingHasCategory");
-            DEBUG_LOG("%s", "load api TWPPUrlRatingHasCategory\n");
+            SLOGD("load api TWPPUrlRatingHasCategory");
             if (TmpUrlRatingHasCategory == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPUrlRatingHasCategory in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPUrlRatingHasCategory in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
 
             TmpUrlRatingGetCategories = dlsym(pTmp, "TWPPUrlRatingGetCategories");
-            DEBUG_LOG("%s", "load api TWPPUrlRatingGetCategories\n");
+            SLOGD("load api TWPPUrlRatingGetCategories");
             if (TmpUrlRatingGetCategories == NULL)
             {
-                DEBUG_LOG("Failed to load TWPPUrlRatingGetCategories in %s\n", SITE_PLUGIN_PATH);
+                SLOGE("Failed to load TWPPUrlRatingGetCategories in %s", SITE_PLUGIN_PATH);
                 dlclose(pTmp);
                 break;
             }
@@ -576,7 +569,7 @@ static SitePluginContext *LoadPlugin(void)
     }
     else
     {
-        DEBUG_LOG("No plugin found.\n");
+        SLOGE("No plugin found.");
     }
 
     return pCtx;