summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHwankyu Jhun <h.jhun@samsung.com>2018-04-19 16:10:12 +0900
committerHwankyu Jhun <h.jhun@samsung.com>2018-04-19 16:11:20 +0900
commit528dfb9f0f349ebe06a67a1a70f33b02b274babe (patch)
tree20977daacbca8ca4377960c0d51786c00f0fd523
parent9c66dab7c7c14d36c344a59f1c7ee663ddba2d96 (diff)
downloadaul-1-528dfb9f0f349ebe06a67a1a70f33b02b274babe.tar.gz
aul-1-528dfb9f0f349ebe06a67a1a70f33b02b274babe.tar.bz2
aul-1-528dfb9f0f349ebe06a67a1a70f33b02b274babe.zip
Reduce printing error logs
- Fixes getting svc db path - Fixes exception handling about sqlite3_step() Change-Id: I1b54dcb2dad4da334018c1e0bae9b84cd42dff80 Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
-rwxr-xr-xsrc/service_db.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/service_db.c b/src/service_db.c
index 60987f4a..5fa39f0f 100755
--- a/src/service_db.c
+++ b/src/service_db.c
@@ -78,7 +78,7 @@ static char *__get_svc_db(uid_t uid)
{
char db_path[PATH_MAX];
- if (uid != GLOBAL_USER && uid != ROOT_UID) {
+ if (uid >= REGULAR_UID_MIN) {
snprintf(db_path, sizeof(db_path), "%s/user/%d/.appsvc.db",
tzplatform_getenv(TZ_SYS_DB), uid);
} else {
@@ -111,17 +111,18 @@ static int __init(uid_t uid, bool readonly, sqlite3 **svc_db)
rc = sqlite3_open_v2(db_path, svc_db,
readonly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_READWRITE,
NULL);
- free(db_path);
if (rc) {
- _E("Can't open database: %d, %s, extended: %d",
- rc, sqlite3_errmsg(*svc_db),
+ _E("Can't open database(%s): %d, %s, extended: %d",
+ db_path, rc, sqlite3_errmsg(*svc_db),
sqlite3_extended_errcode(*svc_db));
+ free(db_path);
if (*svc_db) {
sqlite3_close(*svc_db);
*svc_db = NULL;
}
return -1;
}
+ free(db_path);
return 0;
}
@@ -948,8 +949,10 @@ int __get_appid_from_alias_info(const char *alias_appid, char **appid,
ret = sqlite3_step(stmt);
if (ret != SQLITE_ROW) {
- _W("sqlite3 step() error: %d(%s)",
- ret, sqlite3_errmsg(svc_db));
+ if (ret != SQLITE_DONE) {
+ _W("sqlite3 step() error: %d(%s)",
+ ret, sqlite3_errmsg(svc_db));
+ }
result = -1;
goto end;
}