Improve scanner main function

And remove unnecessary parameter of __msc_add_event_receiver()

Change-Id: Ic2c2c1ec4e6936e6f19bf51bec04484e28ac0acb

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index ddbff59..32ba130 100644 (file)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -61,7 +61,7 @@ static int __msc_power_off_cb(int option, void *data)
        return MS_MEDIA_ERR_NONE;
 }
 
-static void __msc_add_event_receiver(void *data)
+static void __msc_add_event_receiver(void)
 {
        /*set power off callback function*/
        ms_sys_set_poweroff_cb(__msc_power_off_cb, NULL);
@@ -82,13 +82,12 @@ int main(int argc, char **argv)
        GThread *storage_extract_thread = NULL;
        GThread *folder_extract_thread = NULL;
        GIOChannel *channel = NULL;
-
        int err = -1;
        int fd = -1;
 
        MS_DBG_INFO("Scanner-V2 start");
 
-       __msc_add_event_receiver(NULL);
+       __msc_add_event_receiver();
 
        /*load functions from plusin(s)*/
        err = ms_load_functions();
@@ -100,16 +99,16 @@ int main(int argc, char **argv)
        /*Init main loop*/
        scanner_mainloop2 = g_main_loop_new(NULL, FALSE);
 
-       /*Init for register file*/
-       /*These are a communicator for thread*/
        msc_init_scanner();
        msc_init_extract_thread();
        msc_init_scan_thread();
 
        /* Create pipe */
-       err = unlink(MS_SCANNER_FIFO_PATH_REQ);
-       if (err != 0)
-               MS_DBG_STRERROR("[No-Error] unlink failed");
+       if (g_file_test(MS_SCANNER_FIFO_PATH_REQ, G_FILE_TEST_EXISTS)) {
+               err = unlink(MS_SCANNER_FIFO_PATH_REQ);
+               if (err != 0)
+                       MS_DBG_STRERROR("unlink failed");
+       }
 
        err = mkfifo(MS_SCANNER_FIFO_PATH_REQ, MS_SCANNER_FIFO_MODE);
        if (err != 0) {
@@ -158,10 +157,8 @@ int main(int argc, char **argv)
        msc_deinit_extract_thread();
        msc_deinit_scan_thread();
 
-       /*close pipe*/
        close(fd);
 
-       /*unload functions*/
        ms_unload_functions();
 
 EXIT:

diff --git a/src/scanner/media-scanner.c b/src/scanner/media-scanner.c
index b62bf22..a422274 100644 (file)
--- a/src/scanner/media-scanner.c
+++ b/src/scanner/media-scanner.c
@@ -60,7 +60,8 @@ int main(int argc, char **argv)
        int err = -1;
        int fd = -1;
 
-       /*set power off callback function*/
+       MS_DBG_INFO("SCANNER start");
+
        ms_sys_set_poweroff_cb(__msc_power_off_cb, NULL);
 
        /*load functions from plusin(s)*/
@@ -110,20 +111,20 @@ int main(int argc, char **argv)
 
        g_main_loop_run(scanner_mainloop);
 
+       ms_sys_unset_poweroff_cb();
+
        g_thread_join(scan_thread);
        g_thread_join(register_thread);
        g_thread_join(storage_scan_thread);
 
        msc_deinit_scanner();
-       /*close pipe*/
+
        close(fd);
-       /*unload functions*/
+
        ms_unload_functions();
 
-       ms_sys_unset_poweroff_cb();
 EXIT:
        MS_DBG_INFO("SCANNER is shutting down");
 
        return 0;
 }
-