Remove unused code

Delete protocol enum, and unused parameters

Change-Id: Ifb19c9d49881622a6321e8459032dd2567afdd9f
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util-ipc.h b/lib/include/media-util-ipc.h
index 03e8570..ca7b2c0 100755 (executable)
--- a/lib/include/media-util-ipc.h
+++ b/lib/include/media-util-ipc.h
@@ -32,13 +32,8 @@ extern "C" {
 
 #include "media-server-ipc.h"
 
-typedef enum {
-       MS_PROTOCOL_UDP,
-       MS_PROTOCOL_TCP
-} ms_protocol_e;
-
-int ms_ipc_create_client_socket(ms_protocol_e protocol, int timeout_sec, ms_sock_info_s* sock_info);
-int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port, int *sock_fd);
+int ms_ipc_create_client_socket(int timeout_sec, ms_sock_info_s* sock_info);
+int ms_ipc_create_server_socket(ms_msg_port_type_e port, int *sock_fd);
 int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_msg_port_type_e port, ms_comm_msg_s *send_msg, struct sockaddr_un *serv_addr);
 int ms_ipc_send_msg_to_client_tcp(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *client_addr);
 int ms_ipc_receive_message(int sockfd, void *recv_msg, unsigned int msg_size);

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 8122e12..7459b87 100755 (executable)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -48,9 +48,8 @@ static void __media_db_destroy_sql_list()
 {
        int i = 0;
 
-       for (i = 0; i < g_list_idx; i++) {
+       for (i = 0; i < g_list_idx; i++)
                MS_SAFE_FREE(sql_list[i]);
-       }
 
        MS_SAFE_FREE(sql_list);
        g_list_idx = 0;
@@ -87,8 +86,8 @@ static char* __media_get_media_DB(uid_t uid)
        }
 
        ret = getgrnam_r("users", &grpinfo, grpbuf, grpbufsize, &grpresult);
-       if((ret == 0) && (grpresult != NULL)) {
-//             MSAPI_DBG("getgrnam_r users success...\n");
+       if ((ret == 0) && (grpresult != NULL)) {
+               /*MSAPI_DBG("getgrnam_r users success...\n");*/
        } else {
                MSAPI_DBG_ERR("getgrnam_r users failed ret[%d]", ret);
                goto END;
@@ -96,7 +95,7 @@ static char* __media_get_media_DB(uid_t uid)
 
        if (uid == getuid()) {
                if (MS_STRING_VALID(MEDIA_DB_NAME)) {
-//                     MSAPI_DBG("MS_STRING_VALID MEDIA_DB_NAME valid...\n");
+                       /*MSAPI_DBG("MS_STRING_VALID MEDIA_DB_NAME valid...\n");*/
                        result_passwd = strdup(MEDIA_DB_NAME);
                } else {
                        MSAPI_DBG_ERR("MS_STRING_VALID MEDIA_DB_NAME invalid...\n");
@@ -120,16 +119,15 @@ static char* __media_get_media_DB(uid_t uid)
                }
 
                ret = getpwuid_r(uid, &pwdinfo, pwdbuf, pwdbufsize, &pwdresult);
-               if((ret == 0) && (pwdresult != NULL)) {
-//                     MSAPI_DBG("getpwuid uid[%d] success\n", uid);
+               if ((ret == 0) && (pwdresult != NULL)) {
+                       /*MSAPI_DBG("getpwuid uid[%d] success\n", uid);*/
                } else {
                        MSAPI_DBG_ERR("getpwuid uid[%d] failed ret[%d]", uid, ret);
                        MS_SAFE_FREE(pwdbuf);
                        goto END;
                }
 
-//             MSAPI_DBG("grpinfo.gr_gid[%d], pwdinfo.pw_gid[%d]", grpinfo.gr_gid, pwdinfo.pw_gid);
-               if(grpinfo.gr_gid != pwdinfo.pw_gid) {
+               if (grpinfo.gr_gid != pwdinfo.pw_gid) {
                        MSAPI_DBG_ERR("UID [%d] does not belong to 'users' group![%d][%d]", uid, grpinfo.gr_gid, pwdinfo.pw_gid);
                        MS_SAFE_FREE(pwdbuf);
                        goto END;
@@ -194,7 +192,7 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
        /*In TV case, if the HDD is inserted, so many data can be inserted.
        So the size of the journal file is incresed.
        We are trucate the journal for reducing the usage rate of the internal storage.*/
-//     ret = sqlite3_exec(*db_handle, "PRAGMA journal_mode = TRUNCATE", NULL, NULL, NULL);
+       /*ret = sqlite3_exec(*db_handle, "PRAGMA journal_mode = TRUNCATE", NULL, NULL, NULL);*/
        sql = sqlite3_mprintf("%s", "PRAGMA journal_mode = OFF");
        ret = sqlite3_exec(*db_handle, sql, NULL, NULL, NULL);
        sqlite3_free(sql);
@@ -258,8 +256,6 @@ static int __media_db_request_update_tcp(ms_msg_type_e msg_type, const char *req
                return MS_MEDIA_ERR_INVALID_PARAMETER;
        }
 
-//     MSAPI_DBG("querysize[%d] query[%s]", request_msg_size, request_msg);
-
        ms_comm_msg_s send_msg;
        memset((void *)&send_msg, 0, sizeof(ms_comm_msg_s));
 
@@ -269,14 +265,13 @@ static int __media_db_request_update_tcp(ms_msg_type_e msg_type, const char *req
        send_msg.uid = uid;
 
        /*Create Socket*/
-       ret = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info);
+       ret = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info);
        sockfd = sock_info.sock_fd;
        MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
 
        /*Set server Address*/
        memset(&serv_addr, 0, sizeof(serv_addr));
        serv_addr.sun_family = AF_UNIX;
-//     MSAPI_DBG_SLOG("%s", MEDIA_IPC_PATH[port]);
        strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port])));
 
        /* Connecting to the media db server */
@@ -351,14 +346,13 @@ static int __media_db_prepare_tcp_client_socket()
        sock_info.port = MS_DB_BATCH_UPDATE_PORT;
 
        /*Create TCP Socket*/
-       ret = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info);
+       ret = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info);
        sockfd = sock_info.sock_fd;
        MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
 
        /*Set server Address*/
        memset(&serv_addr, 0, sizeof(serv_addr));
        serv_addr.sun_family = AF_UNIX;
-//     MSAPI_DBG_SLOG("%s", MEDIA_IPC_PATH[port]);
        strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[sock_info.port])));
 
        /* Connecting to the media db server */
@@ -418,9 +412,8 @@ static int __media_db_request_batch_update(ms_msg_type_e msg_type, const char *r
        strncpy(send_msg.msg, request_msg, request_msg_size);
 
        sockfd = __media_db_get_client_tcp_sock();
-       if (sockfd <= 0) {
+       if (sockfd <= 0)
                return MS_MEDIA_ERR_SOCKET_CONN;
-       }
 
        /* Send request */
        if (send(sockfd, &send_msg, sizeof(send_msg), 0) != sizeof(send_msg)) {
@@ -460,9 +453,7 @@ static int _media_db_update_directly(sqlite3 *db_handle, const char *sql_str)
        char *zErrMsg = NULL;
        int retry_count = 0;
 
-//     MSAPI_DBG_SLOG("SQL = [%s]", sql_str);
-
-EXEC_RETRY :
+EXEC_RETRY:
        ret = sqlite3_exec(db_handle, sql_str, NULL, NULL, &zErrMsg);
 
        if (SQLITE_OK != ret) {
@@ -516,7 +507,7 @@ RETRY_CONN:
                        return ret;
                }
        }
-       
+
        *handle = db_handle;
        return MS_MEDIA_ERR_NONE;
 }
@@ -748,7 +739,7 @@ static int __media_db_request_recovery(uid_t uid)
        send_msg.uid = uid;
 
        /*Create Socket*/
-       ret = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info);
+       ret = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info);
        sockfd = sock_info.sock_fd;
        MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
 
@@ -782,14 +773,14 @@ RETRY:
                if (errno == EINTR) {
                        MSAPI_DBG_STRERROR("catch interrupt");
                        goto RETRY;
-               }
+               }
 
                if (errno == EWOULDBLOCK) {
                        if (retry_count < MAX_RETRY_COUNT) {
                                MSAPI_DBG_ERR("TIME OUT[%d]", retry_count);
                                retry_count++;
                                goto RETRY;
-                       }
+                       }
 
                        close(sockfd);
                        MSAPI_DBG_ERR("Timeout. Can't try any more");
@@ -822,7 +813,5 @@ int media_db_get_media_db_path(uid_t uid, char **db_path)
                ret = MS_MEDIA_ERR_INTERNAL;
        }
 
-//     MSAPI_DBG("DB PATH[%s]", *db_path);
-
        return ret;
 }

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
index 1c0c835..5efd854 100644 (file)
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -61,8 +61,7 @@ enum {
        DCM_REQUEST_CANCEL_FACE,
 };
 
-typedef enum
-{
+typedef enum {
        DCM_PHONE,                      /**< Stored only in phone */
        DCM_MMC                         /**< Stored only in MMC */
 } media_dcm_store_type;
@@ -119,7 +118,7 @@ void __media_dcm_shutdown_channel(gboolean only_shutdown)
                MS_SAFE_FREE(req->userData);
                MS_SAFE_FREE(req);
 
-               if(g_manage_queue && len == 0) {
+               if (g_manage_queue && len == 0) {
                        g_queue_free(g_manage_queue);
                        g_manage_queue = NULL;
                }
@@ -139,10 +138,10 @@ int __media_dcm_pop_req_queue(const char *path)
        }
 
        /* Check manage queue */
-       if(g_manage_queue) {
+       if (g_manage_queue) {
                req_len = g_queue_get_length(g_manage_queue);
 
-               if(req_len > 0)
+               if (req_len > 0)
                        _media_dcm_send_request();
        }
 
@@ -302,7 +301,7 @@ int _media_dcm_send_request()
 
        MSAPI_DBG("_media_dcm_send_request start");
 
-       err = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info);
+       err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info);
        if (err != MS_MEDIA_ERR_NONE) {
                MSAPI_DBG_ERR("ms_ipc_create_client_socket failed");
                return err;
@@ -396,7 +395,7 @@ int _media_dcm_request(int msg_type, const char *path, uid_t uid)
        int pid;
        sock_info.port = MS_DCM_CREATOR_PORT;
 
-       err = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info);
+       err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info);
        if (err != MS_MEDIA_ERR_NONE) {
                MSAPI_DBG_ERR("ms_ipc_create_client_socket failed");
                return err;

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index 3e793f9..d81fa6f 100755 (executable)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -67,7 +67,7 @@ static int _mkdir(const char *dir, mode_t mode)
        return mkdir(tmp, mode);
 }
 
-int ms_ipc_create_client_socket(ms_protocol_e protocol, int timeout_sec, ms_sock_info_s* sock_info)
+int ms_ipc_create_client_socket(int timeout_sec, ms_sock_info_s* sock_info)
 {
        int sock = -1;
        struct sockaddr_un serv_addr;
@@ -110,7 +110,7 @@ int ms_ipc_delete_client_socket(ms_sock_info_s* sock_info)
        return 0;
 }
 
-int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port, int *sock_fd)
+int ms_ipc_create_server_socket(ms_msg_port_type_e port, int *sock_fd)
 {
        int i;
        bool bind_success = false;
@@ -126,7 +126,6 @@ int ms_ipc_create_server_socket(ms_protocol_e protocol, ms_msg_port_type_e port,
        }
 
        memset(&serv_addr, 0, sizeof(serv_addr));
-
        serv_addr.sun_family = AF_UNIX;
        unlink(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]));
        strncpy(serv_addr.sun_path, tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port]), strlen(tzplatform_mkpath(TZ_SYS_RUN, MEDIA_IPC_PATH[serv_port])));

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index a61af84..52e7a2f 100755 (executable)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -64,7 +64,7 @@ bool media_util_is_support_senior_mode()
 {
        bool bSupportSeniorMode = false;
 
-       if(system_info_get_value_bool(SYSTEM_INFO_KEY_GET_SENIOR_MODE_SUPPORTED, &bSupportSeniorMode) != SYSTEM_INFO_ERROR_NONE) {
+       if (system_info_get_value_bool(SYSTEM_INFO_KEY_GET_SENIOR_MODE_SUPPORTED, &bSupportSeniorMode) != SYSTEM_INFO_ERROR_NONE) {
                MSAPI_DBG("Get familytv Support failed");
                return false;
        }
@@ -95,8 +95,8 @@ static char* __media_get_path(uid_t uid)
        }
 
        ret = getgrnam_r("users", &grpinfo, grpbuf, grpbufsize, &grpresult);
-       if((ret == 0) && (grpresult != NULL)) {
-//             MSAPI_DBG("getgrnam_r users success...\n");
+       if ((ret == 0) && (grpresult != NULL)) {
+               /*MSAPI_DBG("getgrnam_r users success...\n");*/
        } else {
                MSAPI_DBG_ERR("getgrnam_r users failed ret[%d]", ret);
                goto END;
@@ -122,15 +122,15 @@ static char* __media_get_path(uid_t uid)
                }
 
                ret = getpwuid_r(uid, &pwdinfo, pwdbuf, pwdbufsize, &pwdresult);
-               if((ret == 0) && (pwdresult != NULL)) {
-//                     MSAPI_DBG("getpwuid uid[%d] success\n", uid);
+               if ((ret == 0) && (pwdresult != NULL)) {
+                       /*MSAPI_DBG("getpwuid uid[%d] success\n", uid);*/
                } else {
                        MSAPI_DBG_ERR("getpwuid uid[%d] failed ret[%d]", uid, ret);
                        MS_SAFE_FREE(pwdbuf);
                        goto END;
                }
 
-               // Compare git_t type and not group name
+               /* Compare git_t type and not group name */
                if (grpinfo.gr_gid != pwdinfo.pw_gid) {
                        MSAPI_DBG_ERR("UID [%d] does not belong to 'users' group!", uid);
                        MS_SAFE_FREE(pwdbuf);
@@ -157,10 +157,9 @@ static bool _is_valid_path(const char *path, uid_t uid)
                return false;
 
 #ifdef _USE_SENIOR_MODE
-       if(media_util_is_support_senior_mode()) {
-               if (strncmp(path, MEDIA_ROOT_PATH_SENIOR_MODE, strlen(MEDIA_ROOT_PATH_SENIOR_MODE)) == 0) {
+       if (media_util_is_support_senior_mode()) {
+               if (strncmp(path, MEDIA_ROOT_PATH_SENIOR_MODE, strlen(MEDIA_ROOT_PATH_SENIOR_MODE)) == 0)
                        return true;
-               }
        }
 #endif
 
@@ -170,23 +169,20 @@ static bool _is_valid_path(const char *path, uid_t uid)
 
        length_path = strlen(user_path);
 
-       if (strncmp(path, user_path, length_path) == 0) {
+       if (strncmp(path, user_path, length_path) == 0)
                ret = true;
-       } else if (MS_STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && (strncmp(path, MEDIA_ROOT_PATH_SDCARD, strlen(MEDIA_ROOT_PATH_SDCARD)) == 0)) {
+       else if (MS_STRING_VALID(MEDIA_ROOT_PATH_SDCARD) && (strncmp(path, MEDIA_ROOT_PATH_SDCARD, strlen(MEDIA_ROOT_PATH_SDCARD)) == 0))
                ret = true;
-       } else if (MS_STRING_VALID(MEDIA_ROOT_PATH_USB) && (strncmp(path, MEDIA_ROOT_PATH_USB, strlen(MEDIA_ROOT_PATH_USB)) == 0)) {
+       else if (MS_STRING_VALID(MEDIA_ROOT_PATH_USB) && (strncmp(path, MEDIA_ROOT_PATH_USB, strlen(MEDIA_ROOT_PATH_USB)) == 0))
                ret = true;
-       } else if (MS_STRING_VALID(MEDIA_ROOT_PATH_DISC) && (strncmp(path, MEDIA_ROOT_PATH_DISC, strlen(MEDIA_ROOT_PATH_DISC)) == 0)) {
+       else if (MS_STRING_VALID(MEDIA_ROOT_PATH_DISC) && (strncmp(path, MEDIA_ROOT_PATH_DISC, strlen(MEDIA_ROOT_PATH_DISC)) == 0))
                ret = true;
-       }
 #ifdef _USE_SENIOR_MODE
-       else if (strncmp(path, MEDIA_ROOT_PATH_SENIOR_MODE, strlen(MEDIA_ROOT_PATH_SENIOR_MODE)) == 0) {
+       else if (strncmp(path, MEDIA_ROOT_PATH_SENIOR_MODE, strlen(MEDIA_ROOT_PATH_SENIOR_MODE)) == 0)
                return true;
-       }
 #endif
-       else {
+       else
                ret = false;
-       }
 
        MS_SAFE_FREE(user_path);
 
@@ -274,9 +270,9 @@ gboolean _read_socket(GIOChannel *src, GIOCondition condition, gpointer data)
                req_result.request_type = MEDIA_REQUEST_EXTRACT_COMPLETE;
        } else if (recv_msg.msg_type == MS_MSG_RECEIVE_MSG_FAILED) {
                MSAPI_DBG_ERR("in _read_socket MS_MSG_RECEIVE_MSG_FAILED msg_size[%d]", recv_msg.msg_size);
-               if((recv_msg.msg_size > 0) && (recv_msg.msg_size < MAX_MSG_SIZE)) {
+               if ((recv_msg.msg_size > 0) && (recv_msg.msg_size < MAX_MSG_SIZE))
                        req_result.complete_path = strndup(recv_msg.msg, recv_msg.msg_size);
-               }
+
                req_result.request_type = MEDIA_REQUEST_ERROR_SERVER_RECEIVE_MSG_FAILED;
        } else {
                MSAPI_DBG("The message is invalid!");
@@ -344,9 +340,8 @@ static int _add_request(const char * req_path, media_callback_data *cb_data, GIO
         /*NEED MUTEX*/
         g_mutex_lock(&scan_req_mutex);
 
-       if (req_list == NULL) {
+       if (req_list == NULL)
                req_list = g_array_new(FALSE, FALSE, sizeof(media_scan_data*));
-       }
 
        if (req_list == NULL) {
                MSAPI_DBG_ERR("g_array_new falied");
@@ -519,12 +514,11 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type, const char *s
        send_msg.msg_size = request_msg_size;
        send_msg.uid = uid;
        strncpy(send_msg.msg, request_msg, request_msg_size);
-       if (storage_id != NULL) {
+       if (storage_id != NULL)
                strncpy(send_msg.storage_id, storage_id, MS_UUID_SIZE -1);
-       }
 
        /*Create Socket*/
-       ret = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, 0, &sock_info);
+       ret = ms_ipc_create_client_socket(0, &sock_info);
        sockfd = sock_info.sock_fd;
        if (sock_info.sock_path != NULL)
                sock_path = sock_info.sock_path;
@@ -574,7 +568,7 @@ static int __media_db_request_update_cancel(ms_msg_type_e msg_type, const char *
        strncpy(send_msg.msg, request_msg, request_msg_size);
 
        /*Create Socket*/
-       ret = ms_ipc_create_client_socket(MS_PROTOCOL_TCP, 0, &sock_info);
+       ret = ms_ipc_create_client_socket(0, &sock_info);
        sockfd = sock_info.sock_fd;
 
        MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);

diff --git a/src/server/media-server-db.c b/src/server/media-server-db.c
index b216659..2c4e026 100755 (executable)
--- a/src/server/media-server-db.c
+++ b/src/server/media-server-db.c
@@ -54,7 +54,7 @@ gboolean ms_db_thread(void *data)
        MediaDBHandle *db_handle = NULL;
 
        /* Create TCP Socket*/
-       ret = ms_ipc_create_server_socket(MS_PROTOCOL_TCP, MS_DB_UPDATE_PORT, &sockfd);
+       ret = ms_ipc_create_server_socket(MS_DB_UPDATE_PORT, &sockfd);
        if (ret != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("Failed to create socket");
                return FALSE;
@@ -67,7 +67,7 @@ gboolean ms_db_thread(void *data)
        }
 
        /* Create TCP Socket for batch query*/
-       ret = ms_ipc_create_server_socket(MS_PROTOCOL_TCP, MS_DB_BATCH_UPDATE_PORT, &tcp_sockfd);
+       ret = ms_ipc_create_server_socket(MS_DB_BATCH_UPDATE_PORT, &tcp_sockfd);
        if (ret != MS_MEDIA_ERR_NONE) {
                close(sockfd);
                MS_DBG_ERR("Failed to create socket");

diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
index f50e504..5290c8a 100644 (file)
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -283,7 +283,7 @@ gboolean _ms_dcm_agent_send_msg_to_dcm_server(dcmMsg *recv_msg, dcmMsg *res_msg)
                return FALSE;
        }
 
-       if (ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info) < 0) {
+       if (ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info) < 0) {
                MS_DBG_ERR("ms_ipc_create_client_socket failed");
                return FALSE;
        }
@@ -617,7 +617,7 @@ gboolean _ms_dcm_agent_prepare_tcp_socket(int *sock_fd, unsigned short serv_port
 {
        int sock;
 
-       if (ms_ipc_create_server_socket(MS_PROTOCOL_TCP, serv_port, &sock) < 0) {
+       if (ms_ipc_create_server_socket(serv_port, &sock) < 0) {
                MS_DBG_ERR("_ms_dcm_create_socket failed");
                return FALSE;
        }

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index af11166..5e84cd0 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -532,7 +532,7 @@ static void __ms_add_request_receiver(GMainLoop *mainloop, GIOChannel **channel)
        _mkdir(tzplatform_mkpath(TZ_SYS_RUN, "media-server"), S_IRWXU | S_IRWXG | S_IRWXO);
 
        /* Create and bind new UDP socket */
-       if (ms_ipc_create_server_socket(MS_PROTOCOL_TCP, MS_SCANNER_PORT, &sockfd) != MS_MEDIA_ERR_NONE) {
+       if (ms_ipc_create_server_socket(MS_SCANNER_PORT, &sockfd) != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("Failed to create socket");
                return;
        } else {

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index e243aad..d5e1cba 100644 (file)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -441,7 +441,7 @@ gboolean _ms_thumb_agent_send_msg_to_thumb_server(thumbMsg *recv_msg, thumbMsg *
                return FALSE;
        }
 
-       if (ms_ipc_create_client_socket(MS_PROTOCOL_TCP, MS_TIMEOUT_SEC_10, &sock_info) < 0) {
+       if (ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info) < 0) {
                MS_DBG_ERR("ms_ipc_create_client_socket failed");
                return FALSE;
        }
@@ -827,7 +827,7 @@ gboolean _ms_thumb_agent_prepare_tcp_socket(int *sock_fd, unsigned short serv_po
 {
        int sock;
 
-       if (ms_ipc_create_server_socket(MS_PROTOCOL_TCP, serv_port, &sock) < 0) {
+       if (ms_ipc_create_server_socket(serv_port, &sock) < 0) {
                MS_DBG_ERR("_ms_thumb_create_socket failed");
                return FALSE;
        }