Remove build warning message

Few functions were not used, the functions was not included by define

Change-Id: Idd6cf6b57b6902ab656cc08e8b3e66419b75ce6e
Signed-off-by: jiyong min <jiyong.min@samsung.com>

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index d64fee9..e1a739e 100755 (executable)
--- 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.2.100
+Version:    0.2.101
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index c500a17..2f77034 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -45,6 +45,8 @@
 #include "media-server-device-block.h"
 #include "media-server-dcm.h"
 
+#define DO_SCAN_ON_BOOT 0 /* 0: Don't scan on boot, 1: Do scan on boot */
+
 extern GMutex scanner_mutex;
 
 GMainLoop *mainloop = NULL;
@@ -56,51 +58,10 @@ static void __ms_remove_event_receiver(void);
 static void __ms_add_event_receiver(GIOChannel *channel);
 static void __ms_remove_request_receiver(GIOChannel *channel);
 static void __ms_add_request_receiver(GMainLoop *mainloop, GIOChannel **channel);
-static int __ms_check_mmc_status(void);
-static int __ms_check_usb_status(void);
 static bool __ms_is_dcm_supported(void);
 
 static char *priv_lang = NULL;
 
-static char* __ms_get_path(uid_t uid)
-{
-       int len = 0;
-       char *result_passwd = NULL;
-       struct group *grpinfo = NULL;
-       if (uid == getuid()) {
-               grpinfo = getgrnam("users");
-               if (grpinfo == NULL) {
-                       MS_DBG_ERR("getgrnam(users) returns NULL !");
-                       return NULL;
-               }
-               if (MS_STRING_VALID(MEDIA_ROOT_PATH_INTERNAL))
-                       result_passwd = strndup(MEDIA_ROOT_PATH_INTERNAL, strlen(MEDIA_ROOT_PATH_INTERNAL));
-       } else {
-               char passwd_str[MAX_FILEPATH_LEN] = {0, };
-               struct passwd *userinfo = getpwuid(uid);
-               if (userinfo == NULL) {
-                       MS_DBG_ERR("getpwuid(%d) returns NULL !", uid);
-                       return NULL;
-               }
-               grpinfo = getgrnam("users");
-               if (grpinfo == NULL) {
-                       MS_DBG_ERR("getgrnam(users) returns NULL !");
-                       return NULL;
-               }
-               // Compare git_t type and not group name
-               if (grpinfo->gr_gid != userinfo->pw_gid) {
-                       MS_DBG_ERR("UID [%d] does not belong to 'users' group!", uid);
-                       return NULL;
-               }
-
-               len = snprintf(passwd_str, sizeof(passwd_str), "%s/%s", userinfo->pw_dir, MEDIA_CONTENT_PATH);
-               if (len > 0)
-                       result_passwd = strndup(passwd_str, len);
-       }
-
-       return result_passwd;
-}
-
 void _power_off_cb(ms_power_info_s *power_info, void* data)
 {
        MS_DBG_ERR("POWER OFF");
@@ -282,8 +243,10 @@ int main(int argc, char **argv)
                sleep(1);
        }
 
+#if DO_SCAN_ON_BOOT == 1
        /* update media DB */
        __ms_check_mediadb();
+#endif
 
        /*Active flush */
        malloc_trim(0);
@@ -408,22 +371,47 @@ static void __ms_add_signal_handler(void)
        signal(SIGPIPE, SIG_IGN);
 }
 
-static void __ms_check_mediadb(void)
+////////////////////////////////////////////////////////////////////
+#if DO_SCAN_ON_BOOT == 1
+static char* __ms_get_path(uid_t uid)
 {
-#if 0
-       uid_t uid = 0;
+       int len = 0;
+       char *result_passwd = NULL;
+       struct group *grpinfo = NULL;
+       if (uid == getuid()) {
+               grpinfo = getgrnam("users");
+               if (grpinfo == NULL) {
+                       MS_DBG_ERR("getgrnam(users) returns NULL !");
+                       return NULL;
+               }
+               if (MS_STRING_VALID(MEDIA_ROOT_PATH_INTERNAL))
+                       result_passwd = strndup(MEDIA_ROOT_PATH_INTERNAL, strlen(MEDIA_ROOT_PATH_INTERNAL));
+       } else {
+               char passwd_str[MAX_FILEPATH_LEN] = {0, };
+               struct passwd *userinfo = getpwuid(uid);
+               if (userinfo == NULL) {
+                       MS_DBG_ERR("getpwuid(%d) returns NULL !", uid);
+                       return NULL;
+               }
+               grpinfo = getgrnam("users");
+               if (grpinfo == NULL) {
+                       MS_DBG_ERR("getgrnam(users) returns NULL !");
+                       return NULL;
+               }
+               // Compare git_t type and not group name
+               if (grpinfo->gr_gid != userinfo->pw_gid) {
+                       MS_DBG_ERR("UID [%d] does not belong to 'users' group!", uid);
+                       return NULL;
+               }
 
-       ms_sys_get_uid(&uid);
-       ms_send_storage_scan_request(__ms_get_path(uid), INTERNAL_STORAGE_ID, MS_SCAN_PART, uid);
+               len = snprintf(passwd_str, sizeof(passwd_str), "%s/%s", userinfo->pw_dir, MEDIA_CONTENT_PATH);
+               if (len > 0)
+                       result_passwd = strndup(passwd_str, len);
+       }
 
-       /* update external storage */
-       __ms_check_mmc_status();
-       __ms_check_usb_status();
-#endif
+       return result_passwd;
 }
 
-
-////////////////////////////////////////////////////////////////////
 static int __ms_check_mmc_status(void)
 {
        int ret = MS_MEDIA_ERR_NONE;
@@ -486,6 +474,19 @@ static int __ms_check_usb_status(void)
        return MS_MEDIA_ERR_NONE;
 }
 
+static void __ms_check_mediadb(void)
+{
+       uid_t uid = 0;
+
+       ms_sys_get_uid(&uid);
+       ms_send_storage_scan_request(__ms_get_path(uid), INTERNAL_STORAGE_ID, MS_SCAN_PART, uid);
+
+       /* update external storage */
+       __ms_check_mmc_status();
+       __ms_check_usb_status();
+}
+#endif
+
 static bool __ms_is_dcm_supported()
 {
        bool isFaceRecognitionSupported = FALSE;        /* face_recognition feature supported */