Replaced db-util internal API

This patch replace use of internal API db_util_open() and db_util_close() with public sqlite3 APIs.

Change-Id: I68f42504b9b3a41b3aec3c5d03a928101a7053f2

diff --git a/src/db.c b/src/db.c
index af701de2edb858039c801e7940cddc85f05b4e41..3923282c228b151eabf339ad077aabfaab93fc1b 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -17,7 +17,6 @@
 
 #include <bundle.h>
 #include <Evas.h>
-#include <db-util.h>
 #include <sqlite3.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -102,7 +101,11 @@ HAPI w_home_error_e db_init(db_file_e db_file)
        }
        r = sqlite3_open_v2(db_info.db_file, &db_info.db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
        if (r) {
-               db_util_close(db_info.db);
+               int rc=sqlite3_close(db_info.db);
+               if(rc!=SQLITE_OK) {
+                       _E("fail to close db (%s)",sqlite3_errmsg(db_info.db));
+               }
+               db_info.db=NULL;
                _E("fail to open db %d", r);
                return W_HOME_ERROR_DB_FAILED;
        }
@@ -112,7 +115,11 @@ HAPI w_home_error_e db_init(db_file_e db_file)
        if (r != SQLITE_OK) {
                _E("query error(%d)(%s)", r, errmsg);
                sqlite3_free(errmsg);
-               db_util_close(db_info.db);
+               int rc=sqlite3_close(db_info.db);
+               if(rc!=SQLITE_OK) {
+                       _E("fail to close db (%s)",sqlite3_errmsg(db_info.db));
+               }
+               db_info.db=NULL;
                return W_HOME_ERROR_DB_FAILED;
        }
        return W_HOME_ERROR_NONE;
@@ -127,7 +134,7 @@ HAPI w_home_error_e db_open(const char *db_file)
        if (db_info.db)
                return W_HOME_ERROR_NONE;
 
-       ret = db_util_open(db_file, &db_info.db, DB_UTIL_REGISTER_HOOK_METHOD);
+       ret = sqlite3_open(db_file, &db_info.db);
        if (ret != SQLITE_OK)
                _E("%s", sqlite3_errmsg(db_info.db));
        retv_with_dbmsg_if(ret != SQLITE_OK, W_HOME_ERROR_FAIL);