Fix the Dlog API Error

Change-Id: I5bf47b4bd923a67e9ece9f98008f7bc299cbe0a5
Signed-off-by: cookie <cookie@samsung.com>

diff --git a/bookmark-csc-adaptor/bookmark-csc-adaptor.c b/bookmark-csc-adaptor/bookmark-csc-adaptor.c
index 7d56dc2c416840449edf7c8ecae87fc8ccc24b12..37266249711087fe14dcf83839d4036285bbc99b 100755 (executable)
--- a/bookmark-csc-adaptor/bookmark-csc-adaptor.c
+++ b/bookmark-csc-adaptor/bookmark-csc-adaptor.c
@@ -463,7 +463,7 @@ int bookmark_csc_create(int *id, bookmark_csc_info_fmt *info)
        // 2. wait id from provider.
        errorcode = bp_ipc_read_errorcode(sock);
        if (errorcode != BP_ERROR_NONE) {
-               TRACE_ERROR("[CHECK ERROR] (%d) [%d]", id, errorcode);
+               TRACE_ERROR("[CHECK ERROR] [%d]", errorcode);
                if (errorcode == BP_ERROR_IO_ERROR)
                        __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);

diff --git a/provider/browser-provider-bookmarks.c b/provider/browser-provider-bookmarks.c
index c25d124ba1b2a2eae5973bedb10dda3105ff96c7..8ab08d1321dbc2fbb760ff9359d568ecfb78f5b9 100755 (executable)
--- a/provider/browser-provider-bookmarks.c
+++ b/provider/browser-provider-bookmarks.c
@@ -1348,7 +1348,7 @@ static bp_error_defs __bp_bookmark_csc_reset(int sock)
        if (bp_db_remove_cond(g_db_handle, BP_DB_TABLE_BOOKMARK,
                        BP_DB_BOOKMARK_COL_IS_OPERATOR, 0, BP_DB_COL_TYPE_INT,
                        &is_operator, &errorcode) < 0) {
-               TRACE_ERROR("[ERROR][SQL][%d] RESET");
+               TRACE_ERROR("[ERROR][SQL] RESET");
        }
        pthread_mutex_unlock(&g_db_mutex);
        bp_ipc_send_errorcode(sock, errorcode);
@@ -1431,7 +1431,7 @@ static bp_error_defs __bp_bookmark_reset(int sock)
        if (bp_db_remove_cond(g_db_handle, BP_DB_TABLE_BOOKMARK,
                        BP_DB_BOOKMARK_COL_IS_EDITABLE, 0, BP_DB_COL_TYPE_INT,
                        &is_editable, &errorcode) < 0) {
-               TRACE_ERROR("[ERROR][SQL][%d] RESET");
+               TRACE_ERROR("[ERROR][SQL] RESET");
        }
        pthread_mutex_unlock(&g_db_mutex);
        bp_ipc_send_errorcode(sock, errorcode);
@@ -1598,8 +1598,8 @@ bp_error_defs bp_bookmark_ready_resource()
                                        SQLITE_DBSTATUS_STMT_USED, &pcur, &phighwater,
                                        0)) != SQLITE_OK) {
                if (g_db_handle != 0) {
-                       TRACE_INFO("sql(%p) error:%d, used memory:%d, highwater:%d",
-                                       g_db_handle, ret, pcur, phighwater);
+                       TRACE_INFO("error:%d, used memory:%d, highwater:%d",
+                                        ret, pcur, phighwater);
                        if (g_db_basic_get_info_stmt != NULL) {
                                bp_db_finalize(g_db_basic_get_info_stmt);
                                g_db_basic_get_info_stmt = NULL;

diff --git a/provider/browser-provider-history.c b/provider/browser-provider-history.c
index d8199f4f973b0ee8a7c5db9dfbac2e70d9860dee..dd7ce950b85a79e3d4b68c92259cb38c52acf18f 100755 (executable)
--- a/provider/browser-provider-history.c
+++ b/provider/browser-provider-history.c
@@ -543,7 +543,7 @@ static bp_error_defs __bp_history_set_limit_size(int sock)
                return BP_ERROR_IO_ERROR;
        }
        if (bp_ipc_read_custom_type(sock, &table_size, sizeof(int)) < 0) {
-               TRACE_ERROR("[ERROR][%d] COND SIZE [IO_ERROR]");
+               TRACE_ERROR("[ERROR] COND SIZE [IO_ERROR]");
                bp_ipc_send_errorcode(sock, BP_ERROR_IO_ERROR);
                return BP_ERROR_IO_ERROR;
        }
@@ -724,7 +724,7 @@ static bp_error_defs __bp_history_reset(int sock)
        pthread_mutex_lock(&g_db_mutex);
        if (bp_db_remove_cond(g_db_handle, BP_DB_TABLE_HISTORY,
                        NULL, 0, 0, NULL, &errorcode) < 0) {
-               TRACE_ERROR("[ERROR][SQL][%d] RESET");
+               TRACE_ERROR("[ERROR][SQL] RESET");
        }
        pthread_mutex_unlock(&g_db_mutex);
        bp_ipc_send_errorcode(sock, errorcode);

diff --git a/provider/browser-provider-requests-manager.c b/provider/browser-provider-requests-manager.c
index fecad58143301954cf00e2e675bbed60647622bf..12801076fdce64d396ee999125fb9b1c30436806 100755 (executable)
--- a/provider/browser-provider-requests-manager.c
+++ b/provider/browser-provider-requests-manager.c
@@ -843,14 +843,14 @@ void bp_thread_requests_manager(bp_privates_defs *privates)
                        } else if (now_timeout < prev_timeout ||
                                        (now_timeout - prev_timeout) >
                                        (flexible_timeout + BP_CARE_CLIENT_MIN_INTERVAL)) {
-                               TRACE_WARN("[WARN] check system date prev[%ld]now[%ld]",
-                                       prev_timeout, now_timeout);
+                               TRACE_WARN("[WARN] check system date prev[%d]",
+                                       prev_timeout);
                        } else {
                                if ((now_timeout - prev_timeout) < BP_CARE_CLIENT_MIN_INTERVAL) {
                                        // this is error.
                                        // terminate Process
-                                       TRACE_ERROR("[CRITICAL] Sock exception prev[%ld]now[%ld][%ld]",
-                                                prev_timeout, now_timeout, flexible_timeout);
+                                       TRACE_ERROR("[CRITICAL] Sock exception prev[%d]",
+                                                prev_timeout);
                                        break;
                                }
                        }

diff --git a/provider/browser-provider-socket.c b/provider/browser-provider-socket.c
index 35295863cf5fe8d2b575d431f41284022416e90c..d357f6c6ca5f6cbcb8b1a0566894955a5d21c245 100755 (executable)
--- a/provider/browser-provider-socket.c
+++ b/provider/browser-provider-socket.c
@@ -94,7 +94,7 @@ bp_error_defs bp_ipc_simple_response(int fd, bp_command_fmt *cmd)
                return BP_ERROR_INVALID_PARAMETER;
        }
        if (cmd->cmd <= BP_CMD_NONE) {
-               TRACE_ERROR("[ERROR] check command(%d) sock:%d", cmd, fd);
+               TRACE_ERROR("[ERROR] BP_ERROR_INVALID_PARAMETER");
                return BP_ERROR_INVALID_PARAMETER;
        }
        if (bp_ipc_send_command(fd, cmd) != 0)
@@ -276,16 +276,16 @@ bp_error_defs bp_ipc_check_stderr(bp_error_defs basecode)
 {
        bp_error_defs errorcode = basecode;
        if (errno == EPIPE) {
-               TRACE_ERROR("[EPIPE:%d] Broken Pipe", errno);
+               TRACE_ERROR("BP_ERROR_IO_ERROR");
                errorcode = BP_ERROR_IO_ERROR;
        } else if (errno == EAGAIN) {
-               TRACE_ERROR("[EAGAIN:%d]", errno);
+               TRACE_ERROR("BP_ERROR_IO_EAGAIN");
                errorcode = BP_ERROR_IO_EAGAIN;
        } else if (errno == EINTR) {
-               TRACE_ERROR("[EINTR:%d]", errno);
+               TRACE_ERROR("BP_ERROR_IO_EINTR");
                errorcode = BP_ERROR_IO_EINTR;
        } else {
-               TRACE_ERROR("[errno:%d]", errno);
+               TRACE_ERROR("bp_errno");
        }
        return errorcode;
 }