fix the Coverity Issue 83211 ,83205,83199,83192

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

diff --git a/history-adaptor/history-adaptor.c b/history-adaptor/history-adaptor.c
index 25190ef1db7aed99f9114a2ee8ea0ac7f9658b25..d2b18af1a563b28258583f84f0473fd8d96dd29b 100755 (executable)
--- a/history-adaptor/history-adaptor.c
+++ b/history-adaptor/history-adaptor.c
@@ -70,13 +70,6 @@ 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) {
@@ -538,8 +531,13 @@ 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) {
-               __browser_adaptor_disconnect_mutex_unlock();
+               /* LCOV_EXCL_START */
+               errorcode = BP_ERROR_IO_ERROR;
+               BP_PRINT_ERROR(-1, errorcode);
+               __browser_adaptor_disconnect();
+               pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
+               /* LCOV_EXCL_STOP */
        }
        // wait id from provider.
        errorcode = bp_ipc_read_errorcode(sock);
@@ -629,8 +627,13 @@ 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) {
-               __browser_adaptor_disconnect_mutex_unlock();
+               /* LCOV_EXCL_START */
+               errorcode = BP_ERROR_IO_ERROR;
+               BP_PRINT_ERROR(id, errorcode);
+               __browser_adaptor_disconnect();
+               pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
+               /* LCOV_EXCL_STOP */
        }
        // 2. wait id from provider.
        errorcode = bp_ipc_read_errorcode(sock);
@@ -768,8 +771,13 @@ 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) {
-               __browser_adaptor_disconnect_mutex_unlock();
+               /* LCOV_EXCL_START */
+               errorcode = BP_ERROR_IO_ERROR;
+               BP_PRINT_ERROR(-1, errorcode);
+               __browser_adaptor_disconnect();
+               pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
+               /* LCOV_EXCL_STOP */
        }
        // wait id from provider.
        errorcode = bp_ipc_read_errorcode(sock);
@@ -845,14 +853,24 @@ 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) {
-               __browser_adaptor_disconnect_mutex_unlock();
+               /* LCOV_EXCL_START */
+               errorcode = BP_ERROR_IO_ERROR;
+               BP_PRINT_ERROR(-1, errorcode);
+               __browser_adaptor_disconnect();
+               pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
+               /* LCOV_EXCL_STOP */
        }
        if (oflags > 0) {
                if (bp_adaptor_ipc_send_int(sock, is_like) < 0 ||
                                bp_ipc_send_string(sock, keyword) < 0) {
-                       __browser_adaptor_disconnect_mutex_unlock();
+                       /* LCOV_EXCL_START */
+                       errorcode = BP_ERROR_IO_ERROR;
+                       __browser_adaptor_disconnect();
+                       pthread_mutex_unlock(&g_adaptor_mutex);
                        return -1;
+                       /* LCOV_EXCL_STOP */
+
                }
        }
        // wait id from provider.
@@ -951,8 +969,13 @@ 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) {
-               __browser_adaptor_disconnect_mutex_unlock();
+               /* LCOV_EXCL_START */
+               errorcode = BP_ERROR_IO_ERROR;
+               BP_PRINT_ERROR(-1, errorcode);
+               __browser_adaptor_disconnect();
+               pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
+               /* LCOV_EXCL_STOP */
        }
        if (times_count > 0) {
                int i = 0;
@@ -961,8 +984,13 @@ 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) {
-                               __browser_adaptor_disconnect_mutex_unlock();
+                               /* LCOV_EXCL_START */
+                               errorcode = BP_ERROR_IO_ERROR;
+                               BP_PRINT_ERROR(-1, errorcode);
+                               __browser_adaptor_disconnect();
+                               pthread_mutex_unlock(&g_adaptor_mutex);
                                return -1;
+                               /* LCOV_EXCL_STOP */
                        }
                }
        }
@@ -972,14 +1000,24 @@ int bp_history_adaptor_get_timestamp_ids_p
                oflags = 0; //LCOV_EXCL_LINE
        if (bp_ipc_send_custom_type(sock, &oflags,
                        sizeof(unsigned int)) < 0) {
-               __browser_adaptor_disconnect_mutex_unlock();
+               /* LCOV_EXCL_START */
+               errorcode = BP_ERROR_IO_ERROR;
+               BP_PRINT_ERROR(-1, errorcode);
+               __browser_adaptor_disconnect();
+               pthread_mutex_unlock(&g_adaptor_mutex);
                return -1;
+                /* LCOV_EXCL_STOP */
        }
        if (oflags > 0) {
                if (bp_adaptor_ipc_send_int(sock, is_like) < 0 ||
                                bp_ipc_send_string(sock, keyword) < 0) {
-                       __browser_adaptor_disconnect_mutex_unlock();
+                       /* LCOV_EXCL_START */
+                       errorcode = BP_ERROR_IO_ERROR;
+                       BP_PRINT_ERROR(-1, errorcode);
+                       __browser_adaptor_disconnect();
+                       pthread_mutex_unlock(&g_adaptor_mutex);
                        return -1;
+                        /* LCOV_EXCL_STOP */
                }
        }
        // wait id from provider.