Change error type

Use MS_MEDIA_ERR_DB_INTERNAL instead some db error types for reduce error type

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

diff --git a/lib/include/media-util-err.h b/lib/include/media-util-err.h
index 0cd8819..5a404fa 100755 (executable)
--- a/lib/include/media-util-err.h
+++ b/lib/include/media-util-err.h
@@ -34,15 +34,12 @@
 #define MS_MEDIA_ERR_PERMISSION_DENIED                 -7      /* Do have permission of request */
 
 /* DB operation error*/
-#define MS_MEDIA_ERR_DB_CONNECT_FAIL                           -101    /* connecting database fails */
-#define MS_MEDIA_ERR_DB_UPDATE_FAIL                            -102    /* updating record fails */
-#define MS_MEDIA_ERR_DB_BUSY_FAIL                                      -103    /* DB Busy */
-#define MS_MEDIA_ERR_DB_CONSTRAINT_FAIL                        -104    /* DB CONSTRAINT fails - In case of insert, the record already exists */
-#define MS_MEDIA_ERR_DB_NO_RECORD                              -105    /* Item not found in DB */
-#define MS_MEDIA_ERR_DB_CORRUPT                                        -106    /* DB corrut error */
-#define MS_MEDIA_ERR_DB_PERMISSION                             -107    /* DB permission error */
-#define MS_MEDIA_ERR_DB_FULL_FAIL                                      -108    /* DB storage full error */
-#define MS_MEDIA_ERR_DB_RESET                                          -109    /* media DB is reset */
+#define MS_MEDIA_ERR_DB_BUSY_FAIL                                      -100    /* DB Busy */
+#define MS_MEDIA_ERR_DB_CONSTRAINT_FAIL                        -101    /* DB CONSTRAINT fails - In case of insert, the record already exists */
+#define MS_MEDIA_ERR_DB_NO_RECORD                              -102    /* Item not found in DB */
+#define MS_MEDIA_ERR_DB_CORRUPT                                        -103    /* DB corrut error */
+#define MS_MEDIA_ERR_DB_FULL_FAIL                                      -104    /* DB storage full error */
+#define MS_MEDIA_ERR_DB_RESET                                          -105    /* media DB is reset */
 #define MS_MEDIA_ERR_DB_INTERNAL                                       -110    /* DB internal error */
 
 /* IPC operation error*/

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index d9f6f81..73c8258 100755 (executable)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -164,7 +164,7 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
        char *sql = NULL;
 
        ret = ms_user_get_media_db_path(uid, &db_path);
-       MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, MS_MEDIA_ERR_DB_CONNECT_FAIL, "ms_user_get_media_db_path failed");
+       MSAPI_RETVM_IF(ret != MS_MEDIA_ERR_NONE, MS_MEDIA_ERR_DB_INTERNAL, "ms_user_get_media_db_path failed");
 
        /*Connect DB*/
        if (need_write)
@@ -176,13 +176,13 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
                MSAPI_DBG_ERR("error when db open path[%s],ret[%d]", db_path, ret);
                MS_SAFE_FREE(db_path);
                *db_handle = NULL;
-               return MS_MEDIA_ERR_DB_CONNECT_FAIL;
+               return MS_MEDIA_ERR_DB_INTERNAL;
        }
        MS_SAFE_FREE(db_path);
 
        if (*db_handle == NULL) {
                MSAPI_DBG_ERR("*db_handle is NULL");
-               return MS_MEDIA_ERR_DB_CONNECT_FAIL;
+               return MS_MEDIA_ERR_DB_INTERNAL;
        }
 
        /*Register busy handler*/
@@ -194,7 +194,7 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
                sqlite3_close_v2(*db_handle);
                *db_handle = NULL;
 
-               return MS_MEDIA_ERR_DB_CONNECT_FAIL;
+               return MS_MEDIA_ERR_DB_INTERNAL;
        }
 
        /*For TV internal space issue, change TRUNCATE to OFF */
@@ -213,7 +213,7 @@ static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, boo
                        return MS_MEDIA_ERR_DB_CORRUPT;
                }
 
-               return MS_MEDIA_ERR_DB_CONNECT_FAIL;
+               return MS_MEDIA_ERR_DB_INTERNAL;
        }
 
        /* Set for localized collate */
@@ -330,9 +330,9 @@ EXEC_RETRY:
                                usleep(SLEEP_TIME);
                                goto EXEC_RETRY;
                        }
-                       ret = MS_MEDIA_ERR_DB_UPDATE_FAIL;
+                       ret = MS_MEDIA_ERR_DB_INTERNAL;
                } else {
-                       ret = MS_MEDIA_ERR_DB_UPDATE_FAIL;
+                       ret = MS_MEDIA_ERR_DB_INTERNAL;
                }
        }
 
@@ -554,8 +554,6 @@ int media_db_get_result(sqlite3 *handle, char *sql_str, sqlite3_stmt **stmt)
                MSAPI_DBG_ERR("prepare error %d[%s]", err, sqlite3_errmsg(handle));
                if (err == SQLITE_CORRUPT)
                        return MS_MEDIA_ERR_DB_CORRUPT;
-               else if (err == SQLITE_PERM)
-                       return MS_MEDIA_ERR_DB_PERMISSION;
 
                return MS_MEDIA_ERR_DB_INTERNAL;
        }

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index adfd02d..e7d63a7 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -123,10 +123,7 @@ int ms_load_functions(void)
 
        /*get handle*/
        func_handle = dlopen(CONFIG_PATH, RTLD_LAZY);
-       if (!func_handle) {
-               MS_DBG_ERR("%s", dlerror());
-               return MS_MEDIA_ERR_INTERNAL;
-       }
+       MS_DBG_RETVM_IF(!func_handle, MS_MEDIA_ERR_INTERNAL, "%s", dlerror());
 
        dlerror();      /* Clear any existing error */
 

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 6831b4f..73950cc 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -1620,7 +1620,7 @@ static int __msc_batch_insert(int pid, GArray *path_array, uid_t uid)
        /* connect to media db, if conneting is failed, db updating is stopped */
        err = ms_connect_db(&handle, uid);
        if (err != MS_MEDIA_ERR_NONE)
-               return MS_MEDIA_ERR_DB_CONNECT_FAIL;
+               return MS_MEDIA_ERR_DB_INTERNAL;
 
        /*start db updating */
        /*call for bundle commit*/

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 8dcf6f7..b173a8a 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -494,7 +494,7 @@ static int __msc_batch_insert(int pid, GPtrArray *path_array, uid_t uid)
        int i = 0;
 
        ret = ms_connect_db(&handle, uid);
-       MS_DBG_RETV_IF(ret != MS_MEDIA_ERR_NONE, MS_MEDIA_ERR_DB_CONNECT_FAIL);
+       MS_DBG_RETV_IF(ret != MS_MEDIA_ERR_NONE, MS_MEDIA_ERR_DB_INTERNAL);
 
        ms_batch_commit_enable(true, false, true, pid);
 

diff --git a/src/server/media-server-db-manage.c b/src/server/media-server-db-manage.c
index 3b0137f..2443a0a 100755 (executable)
--- a/src/server/media-server-db-manage.c
+++ b/src/server/media-server-db-manage.c
@@ -137,7 +137,7 @@ int ms_check_corrupt_mediadb(void)
 
        if (media_db_connect(&db_handle, uid, false) != MS_MEDIA_ERR_NONE) {
                MS_DBG_ERR("Failed to connect DB");
-               return MS_MEDIA_ERR_DB_CONNECT_FAIL;
+               return MS_MEDIA_ERR_DB_INTERNAL;
        }
 
        if (media_db_check_integrity(db_handle) != MS_MEDIA_ERR_NONE) {

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index b13d60b..974396a 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -773,7 +773,7 @@ static void __ms_check_mediadb(void)
                ms_send_storage_scan_request_senior_mode(db_handle);
 #endif
 
-       ms_disconnect_db(&db_handle);
+       ms_disconnect_db(db_handle);
        ms_unload_functions();
 #endif