Merge dir_scan function

Merge dir_scan function in mediadb-update tool

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

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index 5181716..bf7170b 100755 (executable)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -416,7 +416,7 @@ static int __get_storage_id(const char *path, char *storage_id, uid_t uid)
        return 0;
 }
 
-int dir_scan_non_recursive(const char *path)
+int dir_scan(const char *path, bool is_recursive)
 {
        int ret = 0;
        char storage_id[36+1] = {0,};
@@ -425,19 +425,7 @@ int dir_scan_non_recursive(const char *path)
        if (ret < 0)
                return -1;
 
-       return media_directory_scanning_async(path, storage_id, FALSE, callback, NULL, tzplatform_getuid(TZ_USER_NAME));
-}
-
-int dir_scan_recursive(char *path)
-{
-       int ret = 0;
-       char storage_id[36+1] = {0,};
-
-       ret = __get_storage_id(path, storage_id, tzplatform_getuid(TZ_USER_NAME));
-       if (ret < 0)
-               return -1;
-
-       return media_directory_scanning_async(path, storage_id, TRUE, callback, NULL, tzplatform_getuid(TZ_USER_NAME));
+       return media_directory_scanning_async(path, storage_id, is_recursive, callback, NULL, tzplatform_getuid(TZ_USER_NAME));
 }
 
 int main(int argc, char **argv)
@@ -489,7 +477,7 @@ int main(int argc, char **argv)
                                else
                                        strncpy(req_path, argv1, len);
                        }
-                       ret = dir_scan_non_recursive(req_path);
+                       ret = dir_scan(req_path, FALSE);
                        if (ret != 0) {
                                printf("error : %d\n", ret);
                                exit(0);
@@ -511,7 +499,7 @@ int main(int argc, char **argv)
                                                strncpy(req_path, argv2, len);
                                }
 
-                               ret = dir_scan_recursive(req_path);
+                               ret = dir_scan(req_path, TRUE);
                                if (ret != 0) {
                                        printf("error : %d\n", ret);
                                        exit(0);
@@ -522,7 +510,7 @@ int main(int argc, char **argv)
                                exit(0);
                        }
                } else {
-                       printf("[%d] invalide option\n", __LINE__);
+                       printf("[%d] invalid option\n", __LINE__);
                        print_help();
                        exit(0);
                }