Fix wrong rua_stat_init parameter 24/77324/1 accepted/tizen/common/20160629.223410 accepted/tizen/ivi/20160630.004002 accepted/tizen/mobile/20160630.004020 accepted/tizen/tv/20160630.003945 accepted/tizen/wearable/20160630.004015 submit/tizen/20160629.112854
authorHyunho Kang <hhstark.kang@samsung.com>
Wed, 29 Jun 2016 10:37:21 +0000 (19:37 +0900)
committerHyunho Kang <hhstark.kang@samsung.com>
Wed, 29 Jun 2016 10:38:57 +0000 (19:38 +0900)
Change-Id: Ic08d5269ad978ec5b44e59bbcf4c401a93861d20
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>
include/rua_stat_internal.h
src/rua_stat_internal.c

index cba004f..daa79a6 100644 (file)
@@ -47,7 +47,7 @@ extern "C" {
 #define WIN_SCORE 100
 #define LOSE_SCORE_RATE 0.7f
 
-int _rua_stat_init(sqlite3 *db, int flags);
+int _rua_stat_init(sqlite3 **db, int flags);
 int _rua_stat_fini(sqlite3 *db);
 
 /**
index 254e7d3..5fd59e6 100644 (file)
@@ -171,37 +171,30 @@ static int __create_table(sqlite3 *db)
        return 0;
 }
 
-static sqlite3 *__db_init(sqlite3 *db, char *root, int flags)
+int _rua_stat_init(sqlite3 **db, int flags)
 {
+       char defname[FILENAME_MAX];
+       const char *rua_stat_db_path = tzplatform_getenv(TZ_USER_DB);
        int r;
 
-       r = db_util_open_with_options(root, &db, flags, NULL);
+       snprintf(defname, sizeof(defname), "%s/%s", rua_stat_db_path, RUA_STAT_DB_NAME);
+       r = db_util_open_with_options(defname, db, flags, NULL);
        if (r) {
                LOGE("db util open error(%d/%d/%d/%s)", r,
-                       sqlite3_errcode(db),
-                       sqlite3_extended_errcode(db),
-                       sqlite3_errmsg(db));
+                       sqlite3_errcode(*db),
+                       sqlite3_extended_errcode(*db),
+                       sqlite3_errmsg(*db));
                return NULL;
 
        }
-       r = __create_table(db);
+
+       r = __create_table(*db);
        if (r) {
-               db_util_close(db);
+               db_util_close(*db);
                return NULL;
        }
 
-       return db;
-}
-
-int _rua_stat_init(sqlite3 *db, int flags)
-{
-       char defname[FILENAME_MAX];
-       const char *rua_stat_db_path = tzplatform_getenv(TZ_USER_DB);
-
-       snprintf(defname, sizeof(defname), "%s/%s", rua_stat_db_path, RUA_STAT_DB_NAME);
-       __db_init(db, defname, flags);
-
-       if (db == NULL) {
+       if (*db == NULL) {
                LOGW("__rua_stat_init error");
                return -1;
        }
@@ -226,7 +219,7 @@ int rua_stat_db_update(char *caller, char *rua_stat_tag)
 
        LOGD("rua_stat_update start");
 
-       r = _rua_stat_init(db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE);
+       r = _rua_stat_init(&db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE);
        if (r == -1) {
                LOGE("__rua_stat_init fail");
                return -1;