Improve ms_read_db_tcp_socket() and remove unused funtion

Change-Id: I144d78d13575283c3ff259b43da760b5ddbe43cd

diff --git a/lib/include/media-util-internal.h b/lib/include/media-util-internal.h
index 491223c..769a094 100755 (executable)
--- a/lib/include/media-util-internal.h
+++ b/lib/include/media-util-internal.h
@@ -32,6 +32,4 @@
 #define MS_STRING_VALID(str)   ((str != NULL && strlen(str) > 0) ? true : false)
 #define SAFE_STRLCPY(dst, src, n)      g_strlcpy(dst, src, n);
 
-int media_db_update_db(sqlite3 *handle, const char *query_str);
-
 #endif /*_MEDIA_UTIL_INTERNAL_H_*/

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 88c271b..ef21077 100755 (executable)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -400,14 +400,6 @@ int media_db_update_db_direct(const char *query_str, uid_t uid)
        return ret;
 }
 
-int media_db_update_db(sqlite3 *handle, const char *query_str)
-{
-       MSAPI_RETVM_IF(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-       MSAPI_RETVM_IF(!MS_STRING_VALID(query_str), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid Query");
-
-       return __media_db_update_directly(handle, query_str);
-}
-
 static int __media_db_request_recovery(uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;

diff --git a/src/server/media-server-db.c b/src/server/media-server-db.c
index 1f9c359..3f9a76d 100755 (executable)
--- a/src/server/media-server-db.c
+++ b/src/server/media-server-db.c
@@ -53,7 +53,6 @@ gpointer ms_db_thread(gpointer data)
        GSource *source = NULL;
        GIOChannel *channel = NULL;
        GMainContext *context = NULL;
-       sqlite3 *db_handle = NULL;
 
        /* Create TCP Socket*/
        ret = ms_ipc_create_server_socket(MS_DB_UPDATE_PORT, &sockfd);
@@ -76,7 +75,7 @@ gpointer ms_db_thread(gpointer data)
        g_io_channel_unref(channel);
 
        /* Set callback to be called when socket is readable */
-       g_source_set_callback(source, (GSourceFunc)ms_read_db_tcp_socket, db_handle, NULL);
+       g_source_set_callback(source, (GSourceFunc)ms_read_db_tcp_socket, NULL, NULL);
        g_db_source_id = g_source_attach(source, context);
        g_source_unref(source);
 

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index b9bcdd5..d764f0c 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -374,7 +374,6 @@ gboolean ms_read_db_tcp_socket(GIOChannel *src, GIOCondition condition, gpointer
        int client_sock = -1;
        ms_comm_msg_s recv_msg;
        int ret = MS_MEDIA_ERR_NONE;
-       sqlite3 *db_handle = (sqlite3 *)data;
        ms_peer_credentials creds;
 
        MS_DBG_RETVM_IF(power_off, G_SOURCE_CONTINUE, "POWER OFF");
@@ -402,21 +401,7 @@ gboolean ms_read_db_tcp_socket(GIOChannel *src, GIOCondition condition, gpointer
                goto ERROR;
        }
 
-       ret = media_db_connect(&db_handle, recv_msg.uid, true);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               MS_DBG_ERR("Failed to connect DB");
-               goto ERROR;
-       }
-
-       if (MS_STRING_VALID(recv_msg.msg)) {
-               ret = media_db_update_db(db_handle, recv_msg.msg);
-               if (ret != MS_MEDIA_ERR_NONE)
-                       MS_DBG_ERR("media_db_update_db error : %d", ret);
-       } else {
-               ret = MS_MEDIA_ERR_INVALID_PARAMETER;
-       }
-
-       media_db_disconnect(db_handle);
+       ret = media_db_update_db_direct(recv_msg.msg, recv_msg.uid);
 
 ERROR:
        if (write(client_sock, &ret, sizeof(ret)) != sizeof(ret))