Remove unnecessary dependency

Change-Id: I90576217e3630f39c8e9f69e90a5cc30aaf24486
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-server-ipc.h b/lib/include/media-server-ipc.h
index d97b10a..ab047a8 100644 (file)
--- a/lib/include/media-server-ipc.h
+++ b/lib/include/media-server-ipc.h
@@ -20,8 +20,7 @@
 #ifndef _MEDIA_SERVER_IPC_H_
 #define _MEDIA_SERVER_IPC_H_
 
-#define MS_TIMEOUT_SEC_10                                      10              /**< Response from Server time out */
-#define MS_TIMEOUT_SEC_20                      20              /**< Response from Media server time out */
+#define MS_TIMEOUT_SEC 10
 
 typedef enum {
        MS_SCAN_DAEMON_PORT = 0,                /**< Port of communication between scanner and server */

diff --git a/lib/include/media-util-db.h b/lib/include/media-util-db.h
index a553029..a5af02a 100644 (file)
--- a/lib/include/media-util-db.h
+++ b/lib/include/media-util-db.h
@@ -25,19 +25,13 @@ extern "C" {
 #endif
 
 #include <stdbool.h>
-#include <sys/types.h>
 #include <sqlite3.h>
 
 int media_db_connect(sqlite3 **handle, uid_t uid, bool need_write);
-
 void media_db_disconnect(sqlite3 *handle);
-
 int media_db_request_update_db(const char *query_str, uid_t uid);
-
 int media_db_update_db_direct(const char *query_str, uid_t uid);
-
 int media_db_check_integrity(sqlite3 *handle);
-
 int media_db_get_result(sqlite3 *handle, char *sql_str, sqlite3_stmt **stmt);
 
 /**

diff --git a/lib/include/media-util-internal.h b/lib/include/media-util-internal.h
index cb87ca5..fa2375d 100644 (file)
--- a/lib/include/media-util-internal.h
+++ b/lib/include/media-util-internal.h
@@ -20,11 +20,9 @@
 #ifndef _MEDIA_UTIL_INTERNAL_H_
 #define _MEDIA_UTIL_INTERNAL_H_
 
-#include <stdint.h>
+#include <glib.h>
 #include <sqlite3.h>
 
-#include "media-util-db.h"
-
 #define MS_SAFE_FREE(src)              { if (src) {free(src); src = NULL; } }
 #define MS_SQL_SAFE_FREE(x)    {if (x != NULL) {sqlite3_free(x); x = NULL; } }
 #define MS_STRING_VALID(str)   ((str != NULL && strlen(str) > 0) ? true : false)

diff --git a/lib/include/media-util-register.h b/lib/include/media-util-register.h
index ae64baf..1be4766 100644 (file)
--- a/lib/include/media-util-register.h
+++ b/lib/include/media-util-register.h
@@ -22,7 +22,6 @@
 
 #include <glib.h>
 #include <stdbool.h>
-#include <sys/types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/lib/include/media-util-user.h b/lib/include/media-util-user.h
index e7ef133..79c30ad 100644 (file)
--- a/lib/include/media-util-user.h
+++ b/lib/include/media-util-user.h
@@ -24,8 +24,6 @@
 extern "C" {
 #endif
 
-#include <sys/types.h>
-
 typedef enum {
        MS_USER_STORAGE_INTERNAL = 0,   /**< The device's internal storage */
        MS_USER_STORAGE_EXTERNAL = 1,   /**< The device's external storage */

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index b145845..0c1de4d 100644 (file)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -18,9 +18,6 @@
  */
 
 #include <unistd.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
 #include <dlfcn.h>
 
 #include <unicode/utypes.h>
@@ -204,7 +201,7 @@ 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_TIMEOUT_SEC_10, &sockfd);
+       ret = ms_ipc_create_client_socket(MS_TIMEOUT_SEC, &sockfd);
        MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
 
        /*Set server Address*/
@@ -420,7 +417,7 @@ static int __media_db_request_recovery(uid_t uid)
        send_msg.uid = uid;
 
        /*Create Socket*/
-       ret = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sockfd);
+       ret = ms_ipc_create_client_socket(MS_TIMEOUT_SEC, &sockfd);
        MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
 
        /*Set server Address*/

diff --git a/lib/media-util-user.c b/lib/media-util-user.c
index b473dcc..3db343e 100644 (file)
--- a/lib/media-util-user.c
+++ b/lib/media-util-user.c
@@ -22,8 +22,6 @@
 #include "media-util.h"
 #include <glib.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 #define USER_BAND 5000;
 

diff --git a/src/server/include/media-server-socket.h b/src/server/include/media-server-socket.h
index e72f0cb..9df15f5 100644 (file)
--- a/src/server/include/media-server-socket.h
+++ b/src/server/include/media-server-socket.h
@@ -20,7 +20,6 @@
 #ifndef _MEDIA_SERVER_SOCKET_H_
 #define _MEDIA_SERVER_SOCKET_H_
 
-#include <sys/stat.h>
 #include "media-common-types.h"
 #include "media-server-ipc.h"
 

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index ac07a18..90a25b7 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -237,7 +237,7 @@ int main(int argc, char **argv)
        }
 
        /*prepare socket*/
-       g_mkdir_with_parents(tzplatform_mkpath(TZ_SYS_RUN, "media-server"), S_IRWXU | S_IRWXG | S_IRWXO);
+       g_mkdir_with_parents(tzplatform_mkpath(TZ_SYS_RUN, "media-server"), 0777);
 
        if (ms_ipc_create_server_socket(MS_SCANNER_PORT, &sockfd) != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("Failed to create socket");

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 0887839..7b2a8ff 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -17,8 +17,6 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <malloc.h>