diff options
| author | Myungki Lee <mk5004.lee@samsung.com> | 2017-09-01 15:00:05 +0900 |
|---|---|---|
| committer | Myungki Lee <mk5004.lee@samsung.com> | 2017-09-04 11:13:26 +0900 |
| commit | 5b26d2d7cfe4f1be1e25c464015302659eb7b396 (patch) | |
| tree | 7d63f45c13c286edba6e219a6922fa18fdfd8c33 | |
| parent | 321ed5388d2525cea22b98d56ddf0bab7b46c293 (diff) | |
| download | badge-5b26d2d7cfe4f1be1e25c464015302659eb7b396.tar.gz badge-5b26d2d7cfe4f1be1e25c464015302659eb7b396.tar.bz2 badge-5b26d2d7cfe4f1be1e25c464015302659eb7b396.zip | |
Use tzplatform_mkpath to get DB_PATH
Change-Id: I1c704313b946a7c6b31db4aa65b5dcb572ea6f87
Signed-off-by: Myungki Lee <mk5004.lee@samsung.com>
| -rwxr-xr-x | src/badge_db.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/src/badge_db.c b/src/badge_db.c index 731bde7..9bdf3bf 100755 --- a/src/badge_db.c +++ b/src/badge_db.c @@ -27,7 +27,6 @@ #include "badge_error.h" #include "badge_internal.h" -#define BADGE_DB_NAME ".badge.db" #define CREATE_BADGE_TABLE " \ PRAGMA journal_mode = PERSIST; \ PRAGMA synchronous = FULL; \ @@ -56,36 +55,31 @@ create table if not exists badge_setting ( \ EXPORT_API int badge_db_init() { - int r; + int ret = BADGE_ERROR_NONE; + int sql_ret; sqlite3 *db = NULL; char *errmsg = NULL; - char defname[FILENAME_MAX]; - const char *db_path = tzplatform_getenv(TZ_SYS_DB); - if (db_path == NULL) { - ERR("fail to get db_path"); - return BADGE_ERROR_OUT_OF_MEMORY; - } - snprintf(defname, sizeof(defname), "%s/%s", db_path, BADGE_DB_NAME); - DBG("db path : %s", defname); - r = sqlite3_open_v2(defname, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL); - if (r) { - db_util_close(db); - ERR("fail to open badge db %d", r); - return BADGE_ERROR_IO_ERROR; + sql_ret = sqlite3_open_v2(BADGE_DB_PATH, &db, + SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL); + if (sql_ret != SQLITE_OK) { + ERR("Failed to open badge db[%d]", sql_ret); + return BADGE_ERROR_FROM_DB; } - r = sqlite3_exec(db, CREATE_BADGE_TABLE, NULL, NULL, &errmsg); + sql_ret = sqlite3_exec(db, CREATE_BADGE_TABLE, NULL, NULL, &errmsg); + if (sql_ret != SQLITE_OK) { + ERR("Failed to exec query[%d][%s]", sql_ret, errmsg); + ret = BADGE_ERROR_FROM_DB; + } - if (r != SQLITE_OK) { - ERR("query error(%d)(%s)", r, errmsg); + if (errmsg) sqlite3_free(errmsg); + + if (db) db_util_close(db); - return BADGE_ERROR_IO_ERROR; - } - db_util_close(db); - return BADGE_ERROR_NONE; + return ret; } EXPORT_API |