Improve error check code

__msc_check_remain_space(uid) function only returns
MS_MEDIA_ERR_NOT_ENOUGH_SPACE, MS_MEDIA_ERR_DB_FULL_FAIL, MS_MEDIA_ERR_NONE

Change-Id: Idb72fb99aedcbab21b0aec02422b802660d0b8c4

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 0990993..aa7635e 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -1027,12 +1027,8 @@ gpointer msc_directory_scan_thread(gpointer data)
                }
 
                /*check remain space*/
-               err = __msc_check_remain_space(uid);
-               if (err == MS_MEDIA_ERR_NOT_ENOUGH_SPACE
-                       || err == MS_MEDIA_ERR_DB_FULL_FAIL){
-                       ret = MS_MEDIA_ERR_NONE;
+               if (__msc_check_remain_space(uid) != MS_MEDIA_ERR_NONE)
                        goto SCAN_DONE;
-               }
 
                scan_type = scan_data->msg_type;
                ret = ms_user_get_storage_type(uid, scan_data->msg, &storage_type);
@@ -1592,9 +1588,7 @@ static int __msc_check_memory_status(uid_t uid)
 
        /*check remain space*/
        ret = __msc_check_remain_space(uid);
-       if (ret == MS_MEDIA_ERR_NOT_ENOUGH_SPACE || ret == MS_MEDIA_ERR_DB_FULL_FAIL){
-               return ret;
-       }
+       MS_DBG_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret);
 
        /*check db size*/
        ms_check_size_mediadb(uid, &db_size);