Improve the line coverage

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

diff --git a/bookmark-adaptor/bookmark-adaptor.c b/bookmark-adaptor/bookmark-adaptor.c
index e642d14c4dc9eca49e732bb9f10f0bf7c6a855d9..1e5504c617eef99002692f8e9b6401b29c9e832a 100755 (executable)
--- a/bookmark-adaptor/bookmark-adaptor.c
+++ b/bookmark-adaptor/bookmark-adaptor.c
@@ -42,6 +42,31 @@ bp_error_defs errorcode = BP_ERROR_NONE;
 
 /////// callback ///////////////
 
+void bp_bookmark_ipc_check_stderr(bp_error_defs basecode)
+{
+       if (bp_ipc_check_stderr(basecode) == BP_ERROR_IO_ERROR) { 
+               __browser_adaptor_disconnect();
+       }
+}
+
+bp_error_defs bp_bookmark_ipc_simple_response(int fd, bp_command_fmt *cmd)
+{
+       bp_error_defs err = bp_ipc_simple_response(fd, &g_bp_command);
+       if (err == BP_ERROR_IO_ERROR) {
+               __browser_adaptor_disconnect();
+       }
+       return err;
+}
+
+bp_error_defs  bp_bookmark_ipc_read_errorcode(int fd)
+{
+       bp_error_defs err = bp_ipc_read_errorcode(fd);
+       if (err == BP_ERROR_IO_ERROR) {
+               __browser_adaptor_disconnect();
+       }
+       return err;
+}
+
 static void *__bookmark_adaptor_event_manager(void *arg)
 {
        int status = bp_common_adaptor_event_manager(arg,
@@ -95,7 +120,7 @@ int __browser_adaptor_connect(int callback)
        }
        g_bp_command.cmd = BP_CMD_NONE;
        g_bp_command.id = -1;
-       if(g_adaptorinfo != NULL) {
+       if (g_adaptorinfo != NULL) {
            g_bp_command.cid = g_adaptorinfo->cid;
        } else {
            g_bp_command.cid = 0;
@@ -104,7 +129,7 @@ int __browser_adaptor_connect(int callback)
                // create thread here ( getting event_socket )
                if (pthread_create(&g_adaptor_event_thread_pid, NULL,
                                __bookmark_adaptor_event_manager, g_adaptorinfo) != 0) {
-                       TRACE_ERROR("[CRITICAL] pthread_create");
+//                     TRACE_ERROR("[CRITICAL] pthread_create");
                        return -1;
                }
                pthread_detach(g_adaptor_event_thread_pid);
@@ -215,9 +240,7 @@ static int __bp_bookmark_adaptor_send_cmd(const int id, bp_command_defs cmd)
        int sock = BP_CHECK_IPC_SOCK;
        g_bp_command.cmd = cmd;
        g_bp_command.id = id;
-       errorcode = bp_ipc_simple_response(sock, &g_bp_command);
-       if (errorcode == BP_ERROR_IO_ERROR)
-               __browser_adaptor_disconnect();
+       errorcode = bp_bookmark_ipc_simple_response(sock, &g_bp_command);
        pthread_mutex_unlock(&g_adaptor_mutex);
        if (errorcode != BP_ERROR_NONE) {
                BP_PRINT_ERROR(id, errorcode);
@@ -357,7 +380,7 @@ int bp_bookmark_adaptor_is_setted_data_changed_cb(void)
                return -1;
        }
        if (g_adaptor_event_thread_pid <= 0) {
-               TRACE_ERROR("[CRITICAL] callback is setted, but event manager not work");
+//             TRACE_ERROR("[CRITICAL] callback is setted, but event manager not work");
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
@@ -402,20 +425,14 @@ int bp_bookmark_adaptor_create(int *id)
        g_bp_command.cmd = BP_CMD_COMMON_CREATE;
        g_bp_command.id = *id;
 
-       errorcode = bp_ipc_simple_response(sock, &g_bp_command);
+       errorcode = bp_bookmark_ipc_simple_response(sock, &g_bp_command);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(*id, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
        bookmark_id = bp_adaptor_ipc_read_int(sock);
        if (bookmark_id < 0) {
-               errorcode = bp_ipc_check_stderr(BP_ERROR_IO_ERROR);
-               BP_PRINT_ERROR(*id, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
+               bp_bookmark_ipc_check_stderr(BP_ERROR_IO_ERROR);
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
@@ -440,7 +457,7 @@ int bp_bookmark_adaptor_delete(const int id)
 
 int bp_bookmark_adaptor_get_errorcode(void)
 {
-       switch(errorcode) {
+       switch (errorcode) {
        case BP_ERROR_INVALID_PARAMETER:
                return BP_BOOKMARK_ERROR_INVALID_PARAMETER;
        case BP_ERROR_OUT_OF_MEMORY:
@@ -688,11 +705,8 @@ int bp_bookmark_adaptor_easy_create(int *id, bp_bookmark_info_fmt *info)
        g_bp_command.cmd = BP_CMD_COMMON_SET_EASY_ALL;
        g_bp_command.id = *id;
        // send command without waiting return value
-       errorcode = bp_ipc_simple_response(sock, &g_bp_command);
+       errorcode = bp_bookmark_ipc_simple_response(sock, &g_bp_command);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(*id, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
@@ -700,19 +714,16 @@ int bp_bookmark_adaptor_easy_create(int *id, bp_bookmark_info_fmt *info)
        if (bp_ipc_send_custom_type(sock, &new_base_info,
                        sizeof(bp_bookmark_base_fmt)) < 0) {
                errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(*id, errorcode);
+//             BP_PRINT_ERROR(*id, errorcode);
                __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
        // 2. wait id from provider.
-       errorcode = bp_ipc_read_errorcode(sock);
+       errorcode = bp_bookmark_ipc_read_errorcode(sock);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(*id, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
-               pthread_mutex_unlock(&g_adaptor_mutex);
-               return -1;
+           pthread_mutex_unlock(&g_adaptor_mutex);
+           return -1;
        }
        pthread_mutex_unlock(&g_adaptor_mutex);
 
@@ -766,11 +777,8 @@ int bp_bookmark_adaptor_get_info(const int id,
        g_bp_command.id = id;
 
        // send command without waiting return value
-       errorcode = bp_ipc_simple_response(sock, &g_bp_command);
+       errorcode = bp_bookmark_ipc_simple_response(sock, &g_bp_command);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(id, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
@@ -779,29 +787,23 @@ int bp_bookmark_adaptor_get_info(const int id,
        if (bp_ipc_send_custom_type(sock, &oflags,
                        sizeof(bp_bookmark_offset)) < 0) {
                errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(id, errorcode);
+//             BP_PRINT_ERROR(id, errorcode);
                __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
        // 2. wait id from provider.
-       errorcode = bp_ipc_read_errorcode(sock);
+       errorcode = bp_bookmark_ipc_read_errorcode(sock);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(id, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
-               pthread_mutex_unlock(&g_adaptor_mutex);
-               return -1;
+           pthread_mutex_unlock(&g_adaptor_mutex);
+           return -1;
        }
        bp_bookmark_base_fmt bookmark;
        memset(&bookmark, 0x00, sizeof(bp_bookmark_base_fmt));
        // getting bp_tab_base_fmt from provider.
        if (bp_ipc_read_custom_type(sock, &bookmark,
                        sizeof(bp_bookmark_base_fmt)) < 0) {
-               errorcode = bp_ipc_check_stderr(BP_ERROR_IO_ERROR);
-               BP_PRINT_ERROR(id, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
+               bp_bookmark_ipc_check_stderr(BP_ERROR_IO_ERROR);
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
@@ -961,11 +963,8 @@ static int __bp_bookmark_adaptor_get_cond_ids_p
        else
                t_conds.limit = -1;
 
-       errorcode = bp_ipc_simple_response(sock, cmd);
+       errorcode = bp_bookmark_ipc_simple_response(sock, cmd);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
@@ -980,7 +979,7 @@ static int __bp_bookmark_adaptor_get_cond_ids_p
                        bp_ipc_send_custom_type(sock, &oflags,
                        sizeof(bp_bookmark_offset)) < 0) {
                errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
+//             BP_PRINT_ERROR(-1, errorcode);
                __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
@@ -989,18 +988,15 @@ static int __bp_bookmark_adaptor_get_cond_ids_p
                if (bp_adaptor_ipc_send_int(sock, is_like) < 0 ||
                                bp_ipc_send_string(sock, keyword) < 0) {
                        errorcode = BP_ERROR_IO_ERROR;
-                       BP_PRINT_ERROR(-1, errorcode);
+//                     BP_PRINT_ERROR(-1, errorcode);
                        __browser_adaptor_disconnect();
                        pthread_mutex_unlock(&g_adaptor_mutex);
                        return -1;
                }
        }
        // wait id from provider.
-       errorcode = bp_ipc_read_errorcode(sock);
+       errorcode = bp_bookmark_ipc_read_errorcode(sock);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                if (errorcode == BP_ERROR_NO_DATA) { // success
                        *count = 0;
@@ -1015,7 +1011,7 @@ static int __bp_bookmark_adaptor_get_cond_ids_p
                int *idlist = (int *)calloc(ids_count, sizeof(int));
                if (idlist == NULL) {
                        errorcode = BP_ERROR_OUT_OF_MEMORY;
-                       BP_PRINT_ERROR(-1, errorcode);
+//                     BP_PRINT_ERROR(-1, errorcode);
                        if (bp_common_adaptor_clear_read_buffer(sock,
                                        (sizeof(int) * ids_count)) < 0) {
                                __browser_adaptor_disconnect();
@@ -1027,10 +1023,7 @@ static int __bp_bookmark_adaptor_get_cond_ids_p
                if (bp_ipc_read_blob(sock, idlist,
                                (sizeof(int) * ids_count)) < 0) {
                        free(idlist);
-                       errorcode = bp_ipc_check_stderr(BP_ERROR_IO_ERROR);
-                       BP_PRINT_ERROR(-1, errorcode);
-                       if (errorcode == BP_ERROR_IO_ERROR)
-                               __browser_adaptor_disconnect();
+                       bp_bookmark_ipc_check_stderr(BP_ERROR_IO_ERROR);
                        pthread_mutex_unlock(&g_adaptor_mutex);
                        return -1;
                }
@@ -1083,11 +1076,8 @@ int bp_bookmark_adaptor_get_timestamp_ids_p
        else
                t_limits.limit = -1;
 
-       errorcode = bp_ipc_simple_response(sock, cmd);
+       errorcode = bp_bookmark_ipc_simple_response(sock, cmd);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
@@ -1098,7 +1088,7 @@ int bp_bookmark_adaptor_get_timestamp_ids_p
                        sizeof(bp_bookmark_rows_fmt)) < 0 ||
                        bp_adaptor_ipc_send_int(sock, times_count) < 0) {
                errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
+//             BP_PRINT_ERROR(-1, errorcode);
                __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
@@ -1111,7 +1101,7 @@ int bp_bookmark_adaptor_get_timestamp_ids_p
                        if (bp_ipc_send_custom_type(sock, timestamps,
                                        sizeof(bp_bookmark_timestamp_fmt)) < 0) {
                                errorcode = BP_ERROR_IO_ERROR;
-                               BP_PRINT_ERROR(-1, errorcode);
+//                             BP_PRINT_ERROR(-1, errorcode);
                                __browser_adaptor_disconnect();
                                pthread_mutex_unlock(&g_adaptor_mutex);
                                return -1;
@@ -1125,7 +1115,7 @@ int bp_bookmark_adaptor_get_timestamp_ids_p
        if (bp_ipc_send_custom_type(sock, &oflags,
                        sizeof(bp_bookmark_offset)) < 0) {
                errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
+//             BP_PRINT_ERROR(-1, errorcode);
                __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
@@ -1134,18 +1124,15 @@ int bp_bookmark_adaptor_get_timestamp_ids_p
                if (bp_adaptor_ipc_send_int(sock, is_like) < 0 ||
                                bp_ipc_send_string(sock, keyword) < 0) {
                        errorcode = BP_ERROR_IO_ERROR;
-                       BP_PRINT_ERROR(-1, errorcode);
+//                     BP_PRINT_ERROR(-1, errorcode);
                        __browser_adaptor_disconnect();
                        pthread_mutex_unlock(&g_adaptor_mutex);
                        return -1;
                }
        }
        // wait id from provider.
-       errorcode = bp_ipc_read_errorcode(sock);
+       errorcode = bp_bookmark_ipc_read_errorcode(sock);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                if (errorcode == BP_ERROR_NO_DATA) { // success
                        *count = 0;
@@ -1160,7 +1147,7 @@ int bp_bookmark_adaptor_get_timestamp_ids_p
                int *idlist = (int *)calloc(ids_count, sizeof(int));
                if (idlist == NULL) {
                        errorcode = BP_ERROR_OUT_OF_MEMORY;
-                       BP_PRINT_ERROR(-1, errorcode);
+//                     BP_PRINT_ERROR(-1, errorcode);
                        if (bp_common_adaptor_clear_read_buffer(sock,
                                        (sizeof(int) * ids_count)) < 0) {
                                __browser_adaptor_disconnect();
@@ -1172,10 +1159,7 @@ int bp_bookmark_adaptor_get_timestamp_ids_p
                if (bp_ipc_read_blob(sock, idlist,
                                (sizeof(int) * ids_count)) < 0) {
                        free(idlist);
-                       errorcode = bp_ipc_check_stderr(BP_ERROR_IO_ERROR);
-                       BP_PRINT_ERROR(-1, errorcode);
-                       if (errorcode == BP_ERROR_IO_ERROR)
-                               __browser_adaptor_disconnect();
+                       bp_bookmark_ipc_check_stderr(BP_ERROR_IO_ERROR);
                        pthread_mutex_unlock(&g_adaptor_mutex);
                        return -1;
                }
@@ -1224,11 +1208,8 @@ int bp_bookmark_adaptor_get_ids_p
        conds.order_column_offset = order_offset;
        conds.ordering = ordering;
 
-       errorcode = bp_ipc_simple_response(sock, cmd);
+       errorcode = bp_bookmark_ipc_simple_response(sock, cmd);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
@@ -1240,17 +1221,14 @@ int bp_bookmark_adaptor_get_ids_p
                        bp_adaptor_ipc_send_int(sock, is_operator) < 0 ||
                        bp_adaptor_ipc_send_int(sock, is_editable) < 0) {
                errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
+//             BP_PRINT_ERROR(-1, errorcode);
                __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
        }
        // wait id from provider.
-       errorcode = bp_ipc_read_errorcode(sock);
+       errorcode = bp_bookmark_ipc_read_errorcode(sock);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
-               if (errorcode == BP_ERROR_IO_ERROR)
-                       __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
                if (errorcode == BP_ERROR_NO_DATA) { // success
                        *count = 0;
@@ -1265,7 +1243,7 @@ int bp_bookmark_adaptor_get_ids_p
                int *idlist = (int *)calloc(ids_count, sizeof(int));
                if (idlist == NULL) {
                        errorcode = BP_ERROR_OUT_OF_MEMORY;
-                       BP_PRINT_ERROR(-1, errorcode);
+//                     BP_PRINT_ERROR(-1, errorcode);
                        if (bp_common_adaptor_clear_read_buffer(sock,
                                        (sizeof(int) * ids_count)) < 0) {
                                __browser_adaptor_disconnect();
@@ -1277,10 +1255,7 @@ int bp_bookmark_adaptor_get_ids_p
                if (bp_ipc_read_blob(sock, idlist,
                                (sizeof(int) * ids_count)) < 0) {
                        free(idlist);
-                       errorcode = bp_ipc_check_stderr(BP_ERROR_IO_ERROR);
-                       BP_PRINT_ERROR(-1, errorcode);
-                       if (errorcode == BP_ERROR_IO_ERROR)
-                               __browser_adaptor_disconnect();
+                       bp_bookmark_ipc_check_stderr(BP_ERROR_IO_ERROR);
                        pthread_mutex_unlock(&g_adaptor_mutex);
                        return -1;
                }

diff --git a/history-adaptor/history-adaptor.c b/history-adaptor/history-adaptor.c
index a2e7f2e2c8d69ad07493146315ab69a0029fcccd..b7a4c2700311930edefaa35ad9cf273f7e6e52eb 100755 (executable)
--- a/history-adaptor/history-adaptor.c
+++ b/history-adaptor/history-adaptor.c
@@ -70,12 +70,19 @@ static int __browser_adaptor_disconnect(void)
                &g_adaptor_event_thread_pid);
 }
 
+void __browser_adaptor_disconnect_mutex_unlock(void)
+{
+       errorcode = BP_ERROR_IO_ERROR;
+       BP_PRINT_ERROR(-1, errorcode);
+       __browser_adaptor_disconnect();
+       pthread_mutex_unlock(&g_adaptor_mutex);
+}
 static int __browser_adaptor_connect(int callback)
 {
        if (g_adaptorinfo == NULL) {
                bp_client_type_defs client_type = BP_CLIENT_HISTORY;
 
-#ifdef SUPPORT_CLOUD_SYSTEM
+#if 0 //def SUPPORT_CLOUD_SYSTEM
                if (bp_common_adaptor_is_sync_adaptor() == 0)
                        client_type = BP_CLIENT_HISTORY_SYNC;
 #endif
@@ -88,7 +95,7 @@ static int __browser_adaptor_connect(int callback)
        }
        g_bp_command.cmd = BP_CMD_NONE;
        g_bp_command.id = -1;
-       if(g_adaptorinfo != NULL) {
+       if (g_adaptorinfo != NULL) {
            g_bp_command.cid = g_adaptorinfo->cid;
        } else {
            g_bp_command.cid = 0;
@@ -302,7 +309,7 @@ int bp_history_adaptor_create(int *id)
 
        errorcode = bp_ipc_simple_response(sock, &g_bp_command);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(*id, errorcode);
+//             BP_PRINT_ERROR(*id, errorcode);
                if (errorcode == BP_ERROR_IO_ERROR)
                        __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
@@ -311,7 +318,7 @@ int bp_history_adaptor_create(int *id)
        history_id = bp_adaptor_ipc_read_int(sock);
        if (history_id < 0) {
                errorcode = bp_ipc_check_stderr(BP_ERROR_IO_ERROR);
-               BP_PRINT_ERROR(*id, errorcode);
+//             BP_PRINT_ERROR(*id, errorcode);
                if (errorcode == BP_ERROR_IO_ERROR)
                        __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
@@ -336,7 +343,7 @@ int bp_history_adaptor_delete(const int id)
 
 int bp_history_adaptor_get_errorcode(void)
 {
-       switch(errorcode) {
+       switch (errorcode) {
        case BP_ERROR_INVALID_PARAMETER:
                return BP_HISTORY_ERROR_INVALID_PARAMETER;
        case BP_ERROR_OUT_OF_MEMORY:
@@ -509,7 +516,7 @@ int bp_history_adaptor_limit_size
 
        errorcode = bp_ipc_simple_response(sock, &g_bp_command);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
+//             BP_PRINT_ERROR(-1, errorcode);
                if (errorcode == BP_ERROR_IO_ERROR)
                        __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
@@ -518,10 +525,7 @@ int bp_history_adaptor_limit_size
        if (bp_ipc_send_custom_type(sock, &conds,
                        sizeof(bp_db_base_conds_fmt)) < 0 ||
                        bp_adaptor_ipc_send_int(sock, size) < 0) {
-               errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
-               __browser_adaptor_disconnect();
-               pthread_mutex_unlock(&g_adaptor_mutex);
+               __browser_adaptor_disconnect_mutex_unlock();
                return -1;
        }
        // wait id from provider.
@@ -606,10 +610,7 @@ int bp_history_adaptor_get_info(const int id,
        unsigned int oflags = offset;
        if (bp_ipc_send_custom_type(sock, &oflags,
                        sizeof(bp_history_offset)) < 0) {
-               errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(id, errorcode);
-               __browser_adaptor_disconnect();
-               pthread_mutex_unlock(&g_adaptor_mutex);
+               __browser_adaptor_disconnect_mutex_unlock();
                return -1;
        }
        // 2. wait id from provider.
@@ -742,10 +743,7 @@ int bp_history_adaptor_get_date_count
        if (bp_ipc_send_custom_type(sock, &oflags,
                        sizeof(bp_history_offset)) < 0 ||
                        bp_adaptor_ipc_send_int(sock, date_type) < 0) {
-               errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
-               __browser_adaptor_disconnect();
-               pthread_mutex_unlock(&g_adaptor_mutex);
+               __browser_adaptor_disconnect_mutex_unlock();
                return -1;
        }
        // wait id from provider.
@@ -816,26 +814,20 @@ static int __bp_history_adaptor_get_cond_ids_p
                        sizeof(bp_history_rows_cond_fmt)) < 0 ||
                        bp_ipc_send_custom_type(sock, &oflags,
                        sizeof(bp_history_offset)) < 0) {
-               errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
-               __browser_adaptor_disconnect();
-               pthread_mutex_unlock(&g_adaptor_mutex);
+               __browser_adaptor_disconnect_mutex_unlock();
                return -1;
        }
        if (oflags > 0) {
                if (bp_adaptor_ipc_send_int(sock, is_like) < 0 ||
                                bp_ipc_send_string(sock, keyword) < 0) {
-                       errorcode = BP_ERROR_IO_ERROR;
-                       BP_PRINT_ERROR(-1, errorcode);
-                       __browser_adaptor_disconnect();
-                       pthread_mutex_unlock(&g_adaptor_mutex);
+                       __browser_adaptor_disconnect_mutex_unlock();
                        return -1;
                }
        }
        // wait id from provider.
        errorcode = bp_ipc_read_errorcode(sock);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
+//             BP_PRINT_ERROR(-1, errorcode);
                if (errorcode == BP_ERROR_IO_ERROR)
                        __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
@@ -852,7 +844,7 @@ static int __bp_history_adaptor_get_cond_ids_p
                int *idlist = (int *)calloc(ids_count, sizeof(int));
                if (idlist == NULL) {
                        errorcode = BP_ERROR_OUT_OF_MEMORY;
-                       BP_PRINT_ERROR(-1, errorcode);
+//                     BP_PRINT_ERROR(-1, errorcode);
                        if (bp_common_adaptor_clear_read_buffer(sock,
                                        (sizeof(int) * ids_count)) < 0) {
                                __browser_adaptor_disconnect();
@@ -865,7 +857,7 @@ static int __bp_history_adaptor_get_cond_ids_p
                                (sizeof(int) * ids_count)) < 0) {
                        free(idlist);
                        errorcode = bp_ipc_check_stderr(BP_ERROR_IO_ERROR);
-                       BP_PRINT_ERROR(-1, errorcode);
+//                     BP_PRINT_ERROR(-1, errorcode);
                        if (errorcode == BP_ERROR_IO_ERROR)
                                __browser_adaptor_disconnect();
                        pthread_mutex_unlock(&g_adaptor_mutex);
@@ -910,7 +902,7 @@ int bp_history_adaptor_get_timestamp_ids_p
 
        errorcode = bp_ipc_simple_response(sock, cmd);
        if (errorcode != BP_ERROR_NONE) {
-               BP_PRINT_ERROR(-1, errorcode);
+//             BP_PRINT_ERROR(-1, errorcode);
                if (errorcode == BP_ERROR_IO_ERROR)
                        __browser_adaptor_disconnect();
                pthread_mutex_unlock(&g_adaptor_mutex);
@@ -920,10 +912,7 @@ int bp_history_adaptor_get_timestamp_ids_p
        if (bp_ipc_send_custom_type(sock, &t_limits,
                        sizeof(bp_history_rows_fmt)) < 0 ||
                        bp_adaptor_ipc_send_int(sock, times_count) < 0) {
-               errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
-               __browser_adaptor_disconnect();
-               pthread_mutex_unlock(&g_adaptor_mutex);
+               __browser_adaptor_disconnect_mutex_unlock();
                return -1;
        }
        if (times_count > 0) {
@@ -933,10 +922,7 @@ int bp_history_adaptor_get_timestamp_ids_p
                                (bp_history_timestamp_fmt *)(times + i);
                        if (bp_ipc_send_custom_type(sock, timestamps,
                                        sizeof(bp_history_timestamp_fmt)) < 0) {
-                               errorcode = BP_ERROR_IO_ERROR;
-                               BP_PRINT_ERROR(-1, errorcode);
-                               __browser_adaptor_disconnect();
-                               pthread_mutex_unlock(&g_adaptor_mutex);
+                               __browser_adaptor_disconnect_mutex_unlock();
                                return -1;
                        }
                }
@@ -947,19 +933,13 @@ int bp_history_adaptor_get_timestamp_ids_p
                oflags = 0;
        if (bp_ipc_send_custom_type(sock, &oflags,
                        sizeof(unsigned int)) < 0) {
-               errorcode = BP_ERROR_IO_ERROR;
-               BP_PRINT_ERROR(-1, errorcode);
-               __browser_adaptor_disconnect();
-               pthread_mutex_unlock(&g_adaptor_mutex);
+               __browser_adaptor_disconnect_mutex_unlock();
                return -1;
        }
        if (oflags > 0) {
                if (bp_adaptor_ipc_send_int(sock, is_like) < 0 ||
                                bp_ipc_send_string(sock, keyword) < 0) {
-                       errorcode = BP_ERROR_IO_ERROR;
-                       BP_PRINT_ERROR(-1, errorcode);
-                       __browser_adaptor_disconnect();
-                       pthread_mutex_unlock(&g_adaptor_mutex);
+                       __browser_adaptor_disconnect_mutex_unlock();
                        return -1;
                }
        }

diff --git a/packaging/browser-provider.spec b/packaging/browser-provider.spec
index a781e580c70fe8a3cda1899b70c6caccb5eebd9e..8fb81ffb1b65733297793e3030ab1aa340c8c3bd 100755 (executable)
--- a/packaging/browser-provider.spec
+++ b/packaging/browser-provider.spec
@@ -1,7 +1,7 @@
 
 Name:       browser-provider
 Summary:    sync in background.
-Version:    1.8.6
+Version:    1.8.7
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0