Apply tizen coding rule 67/49567/1 accepted/tizen/mobile/20151016.043213 accepted/tizen/tv/20151016.043227 accepted/tizen/wearable/20151016.043241 submit/tizen/20151015.090419
authorHaejeong, Kim <backto.kim@samsung.com>
Thu, 15 Oct 2015 06:23:40 +0000 (15:23 +0900)
committerHaejeong, Kim <backto.kim@samsung.com>
Thu, 15 Oct 2015 06:23:40 +0000 (15:23 +0900)
Change-Id: Ie0c9b69f30372f8867a0be965f9b0ba2f941af4a

packaging/libmedia-service.spec
src/common/media-svc-localize-utils.c
src/common/media-svc-storage.c
src/common/media-svc-util.c
src/common/media-svc.c

index 733ee9c..7520392 100644 (file)
@@ -1,7 +1,7 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version: 0.2.57
-Release:    3
+Version: 0.2.58
+Release:    0
 Group:      System/Libraries
 License:    Apache-2.0 and public domain
 Source0:    %{name}-%{version}.tar.gz
index 5b9a52f..5726f9e 100755 (executable)
@@ -137,8 +137,7 @@ static inline int __media_svc_collation_str(const char *src, char **dest)
 
        collator = ucol_open(region, &status);
 
-       media_svc_retvm_if(U_FAILURE(status), MS_MEDIA_ERR_INTERNAL,
-                          "ucol_open() Failed(%s)", u_errorName(status));
+       media_svc_retvm_if(U_FAILURE(status), MS_MEDIA_ERR_INTERNAL, "ucol_open() Failed(%s)", u_errorName(status));
 
        u_strFromUTF8(NULL, 0, &size, src, strlen(src), &status);
        if (U_FAILURE(status) && status != U_BUFFER_OVERFLOW_ERROR) {
index 30d2c24..c8a675e 100755 (executable)
@@ -215,7 +215,7 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage
 
        storage_path = strndup(path, strlen(path) - remain_len);
 
-       while (sqlite3_step(sql_stmt) == SQLITE_ROW)    {
+       while (sqlite3_step(sql_stmt) == SQLITE_ROW) {
                if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 1))) {
                        if (strlen(storage_path) == strlen((const char *)sqlite3_column_text(sql_stmt, 1))) {
                                if (strncmp(storage_path, (const char *)sqlite3_column_text(sql_stmt, 1), strlen(storage_path)) == 0) {
index 7ebc658..f3dd988 100755 (executable)
@@ -131,18 +131,18 @@ static const char sound_mime_table[SOUND_MIME_NUM][MIME_LENGTH] = {
 };
 
 typedef enum {
-       MEDIA_SVC_EXTRACTED_FIELD_NONE                  = 0x00000001,
-       MEDIA_SVC_EXTRACTED_FIELD_TITLE                 = MEDIA_SVC_EXTRACTED_FIELD_NONE << 1,
-       MEDIA_SVC_EXTRACTED_FIELD_DESC                  = MEDIA_SVC_EXTRACTED_FIELD_NONE << 2,
+       MEDIA_SVC_EXTRACTED_FIELD_NONE                  = 0x00000001,
+       MEDIA_SVC_EXTRACTED_FIELD_TITLE                 = MEDIA_SVC_EXTRACTED_FIELD_NONE << 1,
+       MEDIA_SVC_EXTRACTED_FIELD_DESC                  = MEDIA_SVC_EXTRACTED_FIELD_NONE << 2,
        MEDIA_SVC_EXTRACTED_FIELD_COPYRIGHT             = MEDIA_SVC_EXTRACTED_FIELD_NONE << 3,
        MEDIA_SVC_EXTRACTED_FIELD_AUTHOR                = MEDIA_SVC_EXTRACTED_FIELD_NONE << 4,
-       MEDIA_SVC_EXTRACTED_FIELD_ARTIST                = MEDIA_SVC_EXTRACTED_FIELD_NONE << 5,
+       MEDIA_SVC_EXTRACTED_FIELD_ARTIST                        = MEDIA_SVC_EXTRACTED_FIELD_NONE << 5,
        MEDIA_SVC_EXTRACTED_FIELD_GENRE                 = MEDIA_SVC_EXTRACTED_FIELD_NONE << 6,
        MEDIA_SVC_EXTRACTED_FIELD_ALBUM                 = MEDIA_SVC_EXTRACTED_FIELD_NONE << 7,
        MEDIA_SVC_EXTRACTED_FIELD_TRACKNUM              = MEDIA_SVC_EXTRACTED_FIELD_NONE << 8,
        MEDIA_SVC_EXTRACTED_FIELD_YEAR                  = MEDIA_SVC_EXTRACTED_FIELD_NONE << 9,
        MEDIA_SVC_EXTRACTED_FIELD_CATEGORY              = MEDIA_SVC_EXTRACTED_FIELD_NONE << 10,
-       MEDIA_SVC_EXTRACTED_FIELD_ALBUM_ARTIST          = MEDIA_SVC_EXTRACTED_FIELD_NONE << 11,
+       MEDIA_SVC_EXTRACTED_FIELD_ALBUM_ARTIST  = MEDIA_SVC_EXTRACTED_FIELD_NONE << 11,
 } media_svc_extracted_field_e;
 
 char *_media_info_generate_uuid(void)
@@ -1408,7 +1408,7 @@ int _media_svc_extract_music_metadata_for_update(sqlite3 *handle, media_svc_cont
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_TITLE, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_TITLE)) && (mmf_error == MM_ERROR_NONE) && (size > 0)/* &&   (!isspace(*p))*/) {
+               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_TITLE)) && (mmf_error == MM_ERROR_NONE) && (size > 0)/* && (!isspace(*p))*/) {
                        if (!isspace(*p)) {
                                ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, p);
                                if (ret != MS_MEDIA_ERR_NONE)
@@ -1591,7 +1591,7 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
                }
 
                mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_TITLE, &p, &size, NULL);
-               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_TITLE)) && (mmf_error == MM_ERROR_NONE) && (size > 0)/* &&   (!isspace(*p))*/) {
+               if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_TITLE)) && (mmf_error == MM_ERROR_NONE) && (size > 0)/* && (!isspace(*p))*/) {
                        if (!isspace(*p)) {
                                ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, p);
                                if (ret != MS_MEDIA_ERR_NONE)
index 0501b91..b84661d 100755 (executable)
@@ -1986,7 +1986,7 @@ int media_svc_insert_item_pass1(MediaSvcHandle *handle, const char *storage_id,
                return ret;
        }
 
-       //media_svc_debug("total %d, cur %d insert flag %d", g_media_svc_insert_item_data_cnt,  g_media_svc_insert_item_cur_data_cnt, g_insert_with_noti);
+       //media_svc_debug("total %d, cur %d insert flag %d", g_media_svc_insert_item_data_cnt, g_media_svc_insert_item_cur_data_cnt, g_insert_with_noti);
 
        /*Set or Get folder id*/
        ret = _media_svc_get_and_append_folder_id_by_path(db_handle, storage_id, path, storage_type, folder_uuid, uid);