Adjust space

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

diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c
index 1669b213d499da62cf671d27825cd1392d7759e5..fea9da13647dafb6b9afbbac2c9646770a424a28 100755 (executable)
--- a/src/common/media-svc-media-folder.c
+++ b/src/common/media-svc-media-folder.c
@@ -59,7 +59,7 @@ static int __media_svc_append_folder(bool is_direct, const char *storage_id, ms_
        if (_media_svc_check_pinyin_support())
                _media_svc_get_pinyin_str(folder_name, &folder_name_pinyin);
        /* Sometime SQLITE3 returns NO_RECORD, so need to consider conflict case.. */
-       char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_id, folder_path, folder_name, storage_uuid, folder_storage_type, folder_modified_time, folder_name_pinyin) values (%Q, %Q, %Q, %Q, '%d', '%d', %Q); ",
+       char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_id, folder_path, folder_name, storage_uuid, folder_storage_type, folder_modified_time, folder_name_pinyin) VALUES (%Q, %Q, %Q, %Q, '%d', '%d', %Q);",
                                DB_TABLE_FOLDER, folder_id, folder_path, folder_name, storage_id, storage_type, folder_modified_date, folder_name_pinyin);
 
        if (is_direct)
@@ -189,10 +189,10 @@ int _media_svc_set_folder_validity(bool is_direct, const char *storage_id, const
 
        if (is_recursive) {
                sql = sqlite3_mprintf("UPDATE %q SET validity=%d WHERE storage_uuid='%q' AND (folder_path LIKE '%q/%%' OR folder_path='%q');",
-                                               DB_TABLE_FOLDER, validity, storage_id, start_path, start_path);
+                       DB_TABLE_FOLDER, validity, storage_id, start_path, start_path);
        } else {
                sql = sqlite3_mprintf("UPDATE %q SET validity=%d WHERE storage_uuid='%q' AND folder_path='%q';",
-                                               DB_TABLE_FOLDER, validity, storage_id, start_path);
+                       DB_TABLE_FOLDER, validity, storage_id, start_path);
        }
 
        if (is_direct)

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index fe4a42f3ae624042d94b44a966d1c021c75860f4..9effc26bc17cc4192473c4779bca04b065fc0a62 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -218,6 +218,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
 int _media_svc_update_meta_with_data(media_svc_content_info_s *content_info)
 {
        int ret = MS_MEDIA_ERR_NONE;
+       media_svc_retvm_if(!content_info, MS_MEDIA_ERR_INTERNAL, "content_info is NULL");
 
        /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
        /* This code will be removed when sqlite3_mprintf works clearly */
@@ -424,15 +425,15 @@ int _media_svc_list_query_do(media_svc_query_type_e query_type, uid_t uid)
 
        /* For multiples of 200, empty requests are possible */
        switch (query_type) {
+       case MEDIA_SVC_QUERY_SCANNER:
+               ret = _media_svc_sql_query_list_direct(&g_media_svc_scanner_query_list, uid);
+               break;
        case MEDIA_SVC_QUERY_UPDATE_COMMON:
                if (g_media_svc_update_list == NULL || g_list_length(g_media_svc_update_list) == 0)
                        return MS_MEDIA_ERR_NONE;
 
                ret = _media_svc_sql_query_list(&g_media_svc_update_list, uid);
                break;
-       case MEDIA_SVC_QUERY_SCANNER:
-               ret = _media_svc_sql_query_list_direct(&g_media_svc_scanner_query_list, uid);
-               break;
        default:
                media_svc_error("Wrong type[%d]", query_type);
                return MS_MEDIA_ERR_INVALID_PARAMETER;

diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c
index b3d9765208f8bd07c206ecd07bae93d5db680c81..1cbf692fa3f5d3ab18eb7e03cd5c7d04c1013505 100755 (executable)
--- a/src/common/media-svc-storage.c
+++ b/src/common/media-svc-storage.c
@@ -169,7 +169,7 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage
        media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "Fail to get root path");
 
        if (STRING_VALID(internal_path) && strncmp(path, internal_path, strlen(internal_path)) == 0) {
-               SAFE_STRLCPY(storage_id, DB_TABLE_MEDIA, MEDIA_SVC_UUID_SIZE+1);
+               SAFE_STRLCPY(storage_id, DB_TABLE_MEDIA, MEDIA_SVC_UUID_SIZE + 1);
                g_free(internal_path);
                return MS_MEDIA_ERR_NONE;
        }
@@ -182,7 +182,7 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 0)))
-               SAFE_STRLCPY(storage_id, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_UUID_SIZE+1);
+               SAFE_STRLCPY(storage_id, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_UUID_SIZE + 1);
 
        SQLITE3_FINALIZE(sql_stmt);
 

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 84c54cc74ab1afbbc449b462d0aa60b9ed777e4e..aa2881ac327661eb85e84a2810a3e7d321e80482 100644 (file)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -987,7 +987,6 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
                        content_info->media_meta.description = g_strdup(buf);
                else
                        content_info->media_meta.description = g_strdup(MEDIA_SVC_TAG_UNKNOWN);
-
        }
 
        memset(buf, 0x00, sizeof(buf));
@@ -1008,7 +1007,7 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info)
                        content_info->media_meta.datetaken = g_strdup(buf);
 
                        /* This is same as recorded_date */
-                       content_info->media_meta.recorded_date =  g_strdup(buf);
+                       content_info->media_meta.recorded_date = g_strdup(buf);
                }
        }