Use 'switch-case' instead 'if-else'

Change for better performance

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

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 82ddaaa..bd5502b 100644 (file)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -437,19 +437,26 @@ static int __media_svc_get_media_type(const char *path, const char *mime_type, m
        int ret = MS_MEDIA_ERR_NONE;
        int category = 0;
 
-       media_svc_media_type_e type;
-
        ret = __media_svc_get_content_type_from_mime(path, mime_type, &category);
        if (ret != MS_MEDIA_ERR_NONE)
                media_svc_error("__media_svc_get_content_type_from_mime failed : %d", ret);
 
-       if (category & MEDIA_SVC_CATEGORY_SOUND)                type = MEDIA_SVC_MEDIA_TYPE_SOUND;
-       else if (category & MEDIA_SVC_CATEGORY_MUSIC)   type = MEDIA_SVC_MEDIA_TYPE_MUSIC;
-       else if (category & MEDIA_SVC_CATEGORY_IMAGE)   type = MEDIA_SVC_MEDIA_TYPE_IMAGE;
-       else if (category & MEDIA_SVC_CATEGORY_VIDEO)   type = MEDIA_SVC_MEDIA_TYPE_VIDEO;
-       else    type = MEDIA_SVC_MEDIA_TYPE_OTHER;
-
-       *media_type = type;
+       switch (category) {
+       case MEDIA_SVC_CATEGORY_SOUND:
+               *media_type = MEDIA_SVC_MEDIA_TYPE_SOUND;
+               break;
+       case MEDIA_SVC_CATEGORY_MUSIC:
+               *media_type = MEDIA_SVC_MEDIA_TYPE_MUSIC;
+               break;
+       case MEDIA_SVC_CATEGORY_IMAGE:
+               *media_type = MEDIA_SVC_MEDIA_TYPE_IMAGE;
+               break;
+       case MEDIA_SVC_CATEGORY_VIDEO:
+               *media_type = MEDIA_SVC_MEDIA_TYPE_VIDEO;
+               break;
+       default:
+               *media_type = MEDIA_SVC_MEDIA_TYPE_OTHER;
+       }
 
        return ret;
 }
@@ -1155,23 +1162,10 @@ int _media_svc_extract_music_metadata_for_update(media_svc_content_info_s *conte
 
        mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_TITLE, &p, &size, NULL);
        if (mmf_error == FILEINFO_ERROR_NONE && size > 0) {
-               if (!isspace(*p)) {
-                       content_info->media_meta.title = g_strdup(p);
-               } else {
-                       int idx = 0;
+               while(p && isspace(*p))
+                       p++;
 
-                       for (idx = 0; idx < size; idx++) {
-                               if (isspace(*p)) {
-                                       media_svc_debug("SPACE [%s]", p);
-                                       p++;
-                                       continue;
-                               } else {
-                                       media_svc_debug("Not SPACE [%s]", p);
-                                       content_info->media_meta.title = g_strdup(p);
-                                       break;
-                               }
-                       }
-               }
+               content_info->media_meta.title = g_strdup(p);
        }
 
        mmf_error = mm_file_get_attrs(tag, MM_FILE_TAG_DESCRIPTION, &p, &size, NULL);
@@ -1820,12 +1814,13 @@ int _media_svc_get_media_type(const char *path, int *mediatype)
 
 bool _media_svc_is_valid_storage_type(ms_user_storage_type_e storage_type)
 {
-       if ((storage_type != MS_USER_STORAGE_INTERNAL)
-               && (storage_type != MS_USER_STORAGE_EXTERNAL)
-               && (storage_type != MS_USER_STORAGE_EXTERNAL_USB)) {
+       switch (storage_type) {
+       case MS_USER_STORAGE_INTERNAL:
+       case MS_USER_STORAGE_EXTERNAL:
+       case MS_USER_STORAGE_EXTERNAL_USB:
+               return true;
+       default:
                media_svc_error("storage type is incorrect[%d]", storage_type);
                return false;
        }
-
-       return true;
 }