Change to use db_handle indirectly 94/210294/6
authorjiyong.min <jiyong.min@samsung.com>
Thu, 18 Jul 2019 00:53:18 +0000 (09:53 +0900)
committerhj kim <backto.kim@samsung.com>
Thu, 18 Jul 2019 01:45:21 +0000 (01:45 +0000)
 - _content_get_db_handle() should return proper db_handle

Change-Id: Idf7c51bb9756abcfb02a9628de13b336eb724e4f

src/media_content.c

index 8d0df90..9625034 100755 (executable)
@@ -60,14 +60,14 @@ int _content_get_result(char *query, sqlite3_stmt **stmt)
 {
        int err = MEDIA_CONTENT_ERROR_NONE;
 
-       media_content_retvm_if(db_handle == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected");
+       media_content_retvm_if(_content_get_db_handle() == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected");
        media_content_retvm_if(!STRING_VALID(query), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid query");
 
        media_content_sec_debug("Query[%s]", query);
 
-       err = sqlite3_prepare_v2(db_handle, query, strlen(query), stmt, NULL);
+       err = sqlite3_prepare_v2(_content_get_db_handle(), query, strlen(query), stmt, NULL);
        if (err != SQLITE_OK) {
-               media_content_error("Failed to sqlite3_prepare_v2[%s]", sqlite3_errmsg(db_handle));
+               media_content_error("Failed to sqlite3_prepare_v2[%s]", sqlite3_errmsg(_content_get_result()));
                if (err == SQLITE_BUSY)
                        return MEDIA_CONTENT_ERROR_DB_BUSY;
                else if (err == SQLITE_PERM)
@@ -87,7 +87,7 @@ int _content_query_prepare_by_union_select(sqlite3_stmt **stmt, char *select_que
        char query[MAX_QUERY_SIZE] = {0, };
        memset(query, '\0', sizeof(query));
 
-       media_content_retvm_if(db_handle == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected");
+       media_content_retvm_if(_content_get_db_handle() == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected");
        media_content_retvm_if(!STRING_VALID(select_query1), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query1");
        media_content_retvm_if(!STRING_VALID(select_query2), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query2");
 
@@ -116,9 +116,9 @@ int _content_query_prepare_by_union_select(sqlite3_stmt **stmt, char *select_que
 
        media_content_sec_debug("Query : [%s]", query);
 
-       err = sqlite3_prepare_v2(db_handle, query, strlen(query), stmt, NULL);
+       err = sqlite3_prepare_v2(_content_get_db_handle(), query, strlen(query), stmt, NULL);
        if (err != SQLITE_OK) {
-               media_content_error("DB_FAILED(0x%08x) fail to sqlite3_prepare(), %s", MEDIA_CONTENT_ERROR_DB_FAILED, sqlite3_errmsg(db_handle));
+               media_content_error("DB_FAILED(0x%08x) fail to sqlite3_prepare(), %s", MEDIA_CONTENT_ERROR_DB_FAILED, sqlite3_errmsg(_content_get_result()));
 
                if (err == SQLITE_BUSY) {
                        media_content_error(" BUSY ERROR");