Adjust to new dlog

Fixed dlog message format.

Change-Id: Ib2ecadb551eaa3fc4fa20f782e5e1c734c9047ed

diff --git a/packaging/privacy-guard.changes b/packaging/privacy-guard.changes
index 8b13789..6819f57 100644 (file)
--- a/packaging/privacy-guard.changes
+++ b/packaging/privacy-guard.changes
@@ -1 +1,6 @@
 
+------------------------------------------------------------------------------
+version 0.9.12
+
+- Adjust to new dlog
+  * flag __attribute__((format(printf..))) added to internal __dlog_print()

diff --git a/packaging/privacy-guard.spec b/packaging/privacy-guard.spec
index 51bf3d5..f43a3ec 100644 (file)
--- a/packaging/privacy-guard.spec
+++ b/packaging/privacy-guard.spec
@@ -1,5 +1,5 @@
 Name:           privacy-guard-server
-Version:        0.9.11
+Version:        0.9.12
 Release:        1
 License:        Apache-2.0
 Summary:        Privacy Management

diff --git a/server/src/DlpRuleChangeNotification.cpp b/server/src/DlpRuleChangeNotification.cpp
index 9c33e04..8af37f7 100644 (file)
--- a/server/src/DlpRuleChangeNotification.cpp
+++ b/server/src/DlpRuleChangeNotification.cpp
@@ -155,10 +155,10 @@ DlpRuleChangeNotification::notifyDlpClients()
                        it = m_semaphore_list.erase(it);
                } else {
                        // process does exists, post sem
-                       PG_LOGD("posting sem: 0x%x, pid: %d", it->sem, it->pid);
+                       PG_LOGD("posting sem: %p, pid: %d", it->sem, it->pid);
                        if (sem_post(it->sem) < 0) {
                                res = errno;
-                               PG_LOGE("errro posting sem: 0x%x, pid: %d - %s", it->sem, it->pid, strerror_r(errno, buf, sizeof(buf)));
+                               PG_LOGE("errro posting sem: %p, pid: %d - %s", it->sem, it->pid, strerror_r(errno, buf, sizeof(buf)));
                        }
                        it++;
                }

diff --git a/server/src/PrivacyGuardDb.cpp b/server/src/PrivacyGuardDb.cpp
index 37048d0..3d5a28e 100644 (file)
--- a/server/src/PrivacyGuardDb.cpp
+++ b/server/src/PrivacyGuardDb.cpp
@@ -92,7 +92,7 @@ int
 PrivacyGuardDb::PgAddPrivacyAccessLog(const int userId, const std::string packageId, const std::string privacyId, const time_t date)
 {
        if(userId < 0 || date <= 0) {
-               PG_LOGE("Invalid parameter: userId: [%d], date: [%d]", userId, date);
+               PG_LOGE("Invalid parameter: userId: [%d]", userId);
                return PRIV_GUARD_ERROR_INVALID_PARAMETER;
        }
 
@@ -114,7 +114,7 @@ PrivacyGuardDb::PgAddPrivacyAccessLog(const int userId, const std::string packag
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -162,7 +162,7 @@ PrivacyGuardDb::PgAddMonitorPolicy(const int userId, const std::string packageId
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -216,7 +216,7 @@ PrivacyGuardDb::PgAddMonitorPolicy(const int userId, const std::string packageId
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -271,7 +271,7 @@ PrivacyGuardDb::PgCheckPrivacyPackage(const int userId, const std::string packag
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -325,7 +325,7 @@ PrivacyGuardDb::PgDeleteAllLogsAndMonitorPolicy(void)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -375,7 +375,7 @@ PrivacyGuardDb::PgDeleteAllLogs(void)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -410,7 +410,7 @@ PrivacyGuardDb::PgDeleteLogsByPackageId(const std::string packageId)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -450,7 +450,7 @@ PrivacyGuardDb::PgDeleteMonitorPolicyByPackageId(const std::string packageId)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -511,7 +511,7 @@ PrivacyGuardDb::PgForeachTotalPrivacyCountOfPackage(const int userId, const int
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -599,7 +599,7 @@ PrivacyGuardDb::PgForeachTotalPrivacyCountOfPrivacy(const int userId, const int
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -680,7 +680,7 @@ PrivacyGuardDb::PgForeachPrivacyCountByPrivacyId(const int userId, const int sta
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -776,7 +776,7 @@ PrivacyGuardDb::PgForeachPrivacyCountByPackageId(const int userId, const int sta
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -844,7 +844,7 @@ PrivacyGuardDb::PgGetMonitorPolicy(const int userId, const std::string packageId
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -892,7 +892,7 @@ PrivacyGuardDb::PgGetAllMonitorPolicy(std::list < std::pair < std::string, int >
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -953,7 +953,7 @@ PrivacyGuardDb::PgForeachMonitorPolicyByPackageId(const int userId, const std::s
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1013,7 +1013,7 @@ PrivacyGuardDb::PgForeachPackageIdUsingPrivacy(const int userId, std::list < std
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1190,14 +1190,14 @@ PrivacyGuardDb::PgForeachPackageInfoByPrivacyId(const int userId, const std::str
        // get start~end date (for 7 days)
        end_date = time(NULL);
        localtime_r(&end_date, &date);
-       PG_LOGD("current (end) time [%d]: %4d/%2d/%2d %2d:%2d", end_date, date.tm_year + 1900, date.tm_mon + 1, date.tm_mday, date.tm_hour, date.tm_min);
+       PG_LOGD("current (end) time [%ld]: %4d/%2d/%2d %2d:%2d", end_date, date.tm_year + 1900, date.tm_mon + 1, date.tm_mday, date.tm_hour, date.tm_min);
        date.tm_hour = 0;
        date.tm_min = 0;
        date.tm_sec = 0;
        today_midnight = mktime(&date);
        start_date = today_midnight - (UNIX_TIME_ONE_DAY * (PRIVACY_GUARD_DAYS - 1));
        localtime_r(&start_date, &date);
-       PG_LOGD("start time [%d]: %4d/%2d/%2d %2d:%2d", start_date, date.tm_year + 1900, date.tm_mon + 1, date.tm_mday, date.tm_hour, date.tm_min);
+       PG_LOGD("start time [%ld]: %4d/%2d/%2d %2d:%2d", start_date, date.tm_year + 1900, date.tm_mon + 1, date.tm_mday, date.tm_hour, date.tm_min);
 
        // [CYNARA] Flush Entries
        res = cynara_monitor_entries_flush(p_cynara_monitor);
@@ -1214,7 +1214,7 @@ PrivacyGuardDb::PgForeachPackageInfoByPrivacyId(const int userId, const std::str
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1274,7 +1274,7 @@ PrivacyGuardDb::PgForeachPackageInfoByPrivacyId(const int userId, const std::str
                        p_data.count = count;
 
                        time_t time = sqlite3_column_int(infoStmt, 1);
-                       PG_LOGD("## time[%d]", time);
+                       PG_LOGD("## time[%ld]", time);
                        p_data.time = time;
 
                        packageInfoList.push_back(p_data);
@@ -1310,7 +1310,7 @@ PrivacyGuardDb::PgUpdateMonitorPolicy(const int userId, const std::string packag
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1363,7 +1363,7 @@ PrivacyGuardDb::PgAddMainMonitorPolicy(const int userId)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1412,7 +1412,7 @@ PrivacyGuardDb::PgUpdateMainMonitorPolicy(const int userId, const int mainMonito
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1467,7 +1467,7 @@ PrivacyGuardDb::PgGetMainMonitorPolicy(const int userId, int &mainMonitorPolicy)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1517,7 +1517,7 @@ PrivacyGuardDb::PgDeleteMainMonitorPolicyByUserId(const int userId)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1570,7 +1570,7 @@ PrivacyGuardDb::PgAddLeakLog(leak_log_insert_common_data_s &data, const std::lis
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1697,7 +1697,7 @@ PrivacyGuardDb::PgForeachLeakLogs(const int userId, const char *appName, int cat
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1760,7 +1760,7 @@ PrivacyGuardDb::PgForeachAppLeakCount(const int userId, std::list<leak_log_get_a
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1814,7 +1814,7 @@ PrivacyGuardDb::PgForeachCategoryLeakCount(const int userId, std::list<leak_log_
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1867,7 +1867,7 @@ PrivacyGuardDb::PgForeachLeakLogsByTimestamp(const int userId, const time_t star
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -1922,7 +1922,7 @@ PrivacyGuardDb::PgGetLeakLogDetails(int userId, int logId, leak_log_get_detail_d
        // initialize
        if (m_bInitialized == false)
                initialize();
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if (m_bDBOpen == false)
@@ -2043,7 +2043,7 @@ PrivacyGuardDb::PgPurgeLeakLogs(const int userId)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -2106,7 +2106,7 @@ PrivacyGuardDb::PgPurgeLeakLogsByDays(const int userId, int days)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -2173,7 +2173,7 @@ PrivacyGuardDb::PgPurgeLeakLogsByLogId(const std::list<int> &logId)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -2227,7 +2227,7 @@ PrivacyGuardDb::PgSetDlpProfile(const int userId, const dlp_profile_s &profile)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -2305,7 +2305,7 @@ PrivacyGuardDb::PgGetDlpProfile(const int userId, dlp_profile_s &profile)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -2504,7 +2504,7 @@ PrivacyGuardDb::PgAddDlpCustomRule(int userId, const custom_rule_s &rule)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -2675,7 +2675,7 @@ PrivacyGuardDb::PgUpdateDlpCustomRule(const custom_rule_s &rule)
        // initialize
        if (m_bInitialized == false)
                initialize();
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if (m_bDBOpen == false)
@@ -2754,7 +2754,7 @@ PrivacyGuardDb::PgDeleteDlpCustomRule(int ruleId)
        // initialize
        if (m_bInitialized == false)
                initialize();
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if (m_bDBOpen == false)
@@ -2799,7 +2799,7 @@ PrivacyGuardDb::PgForeachDlpRules(int userId, int profile, std::list<get_custom_
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -2875,7 +2875,7 @@ PrivacyGuardDb::PgAddDlpPattern(const pattern_s &pattern)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -2961,7 +2961,7 @@ PrivacyGuardDb::PgDeleteDlpPattern(int pattern_id)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -3009,7 +3009,7 @@ PrivacyGuardDb::PgForeachDlpPatterns(std::list<get_pattern_s> &patterns)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {
@@ -3059,7 +3059,7 @@ PrivacyGuardDb::PgGetDlpCategories(std::list<std::string> &categories)
        if (m_bInitialized == false) {
                initialize();
        }
-       TryCatchResLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize", res);
+       TryCatchLogReturn(m_bInitialized == true, m_dbMutex.unlock(), PRIV_GUARD_ERROR_NOT_INITIALIZED, "Failed to initialize");
 
        // open db
        if(m_bDBOpen == false) {

diff --git a/setting/src/privacy_guard_client.cpp b/setting/src/privacy_guard_client.cpp
index 540835c..a267269 100644 (file)
--- a/setting/src/privacy_guard_client.cpp
+++ b/setting/src/privacy_guard_client.cpp
@@ -78,7 +78,7 @@ int privacy_guard_client_foreach_total_privacy_count_of_package(const int user_i
                                                                                                                                void *user_data)
 {
        if (user_id < 0 || start_date > end_date || start_date <= 0) {
-               PG_LOGE("Invalid parameters. user id: [%d], start date: [%d], end date: [%d]", user_id, start_date, end_date);
+               PG_LOGE("Invalid parameters. user id: [%d], start date: [%ld], end date: [%ld]", user_id, start_date, end_date);
                return PRIV_GUARD_ERROR_INVALID_PARAMETER;
        }