Remove uncalled port type

'MS_DB_UPDATE_PORT' is never called.
So, removed ms_msg_port_type_e parameter from ms_ipc_send_msg_to_server_tcp().

Change-Id: I14bf2d56a848ef14700076d83a48489c1612d877
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 a53bb3a..b12e0a4 100644 (file)
--- a/lib/include/media-util-ipc.h
+++ b/lib/include/media-util-ipc.h
@@ -79,7 +79,7 @@ typedef struct {
 
 int ms_ipc_create_client_socket(int timeout_sec, int *sock_fd);
 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_server_tcp(int sockfd, 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_accept_client_tcp(int serv_sock, int* client_sock);
 int ms_ipc_request_recovery(uid_t uid);

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index b942c3d..13ecbae 100644 (file)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -115,16 +115,13 @@ ERROR:
        return MS_MEDIA_ERR_IPC;
 }
 
-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_server_tcp(int sockfd, ms_comm_msg_s *send_msg, struct sockaddr_un *serv_addr)
 {
        int ret = MS_MEDIA_ERR_NONE;
        struct sockaddr_un addr = { 0, };
 
        addr.sun_family = AF_UNIX;
-       if (port == MS_DB_UPDATE_PORT)
-               ret = ms_user_make_ipc_path(addr.sun_path, MS_DB_SOCK_PATH, sizeof(addr.sun_path));
-       else
-               ret = ms_user_make_ipc_path(addr.sun_path, MS_SCAN_SOCK_PATH, sizeof(addr.sun_path));
+       ret = ms_user_make_ipc_path(addr.sun_path, MS_SCAN_SOCK_PATH, sizeof(addr.sun_path));
        MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
 
        /* Connecting to the media db server */

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index 98631f5..e1f0ed8 100644 (file)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -263,7 +263,7 @@ static int __media_db_request_update_async(ms_msg_type_e msg_type,
        ret = ms_ipc_create_client_socket(0, &sockfd);
        MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_ipc_create_client_socket failed[%d]", ret);
 
-       ret = ms_ipc_send_msg_to_server_tcp(sockfd, MS_SCANNER_PORT, &send_msg, NULL);
+       ret = ms_ipc_send_msg_to_server_tcp(sockfd, &send_msg, NULL);
        if (ret != MS_MEDIA_ERR_NONE) {
                MSAPI_DBG_ERR("ms_ipc_send_msg_to_server failed : %d", ret);
                close(sockfd);
@@ -298,7 +298,7 @@ static int __media_db_request_update_cancel(ms_msg_type_e msg_type, const char *
        ret = ms_ipc_create_client_socket(0, &sockfd);
        MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_ipc_create_client_socket failed[%d]", ret);
 
-       ret = ms_ipc_send_msg_to_server_tcp(sockfd, MS_SCANNER_PORT, &send_msg, NULL);
+       ret = ms_ipc_send_msg_to_server_tcp(sockfd, &send_msg, NULL);
        close(sockfd);
        MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, ret, "ms_ipc_send_msg_to_server_tcp failed[%d]", ret);
 

diff --git a/lib/media-util-socket-activation.c b/lib/media-util-socket-activation.c
index 46cb676..f4914b0 100644 (file)
--- a/lib/media-util-socket-activation.c
+++ b/lib/media-util-socket-activation.c
@@ -55,7 +55,7 @@ static int __check_media_server()
                return ret;
        }
 
-       ret = ms_ipc_send_msg_to_server_tcp(sockfd, MS_SCANNER_PORT, &send_msg, NULL);
+       ret = ms_ipc_send_msg_to_server_tcp(sockfd, &send_msg, NULL);
        if (ret != MS_MEDIA_ERR_NONE) {
                MSAPI_DBG_ERR("ms_ipc_send_msg_to_server failed : %d", ret);
                close(sockfd);

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 6862a5c..8c953f0 100644 (file)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.5.7
+Version:    0.5.8
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0