summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyunho Kang <hhstark.kang@samsung.com>2016-03-10 13:19:09 +0900
committerHyunho Kang <hhstark.kang@samsung.com>2016-03-10 13:19:56 +0900
commitd7925ea051cbda8d564dab324a2c115585a8b6ec (patch)
tree48ade8401a41fb2beab5cb8fd9c26cf55d6dd408
parent97b5bf2f96c2f795209de1244926d6b31dbf3a31 (diff)
downloadbadge-d7925ea051cbda8d564dab324a2c115585a8b6ec.tar.gz
badge-d7925ea051cbda8d564dab324a2c115585a8b6ec.tar.bz2
badge-d7925ea051cbda8d564dab324a2c115585a8b6ec.zip
Change-Id: I56e9930c71a8322e02df06c57e00243b311982a7 Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>
-rwxr-xr-xsrc/badge.c3
-rwxr-xr-xsrc/badge_internal.c12
2 files changed, 6 insertions, 9 deletions
diff --git a/src/badge.c b/src/badge.c
index 1005e3f..9516d10 100755
--- a/src/badge.c
+++ b/src/badge.c
@@ -109,7 +109,6 @@ int badge_remove(const char *app_id)
{
char *caller = NULL;
int result = BADGE_ERROR_NONE;
- bool existing = false;
if (app_id == NULL)
return BADGE_ERROR_INVALID_PARAMETER;
@@ -146,7 +145,6 @@ int badge_set_count(const char *app_id, unsigned int count)
{
char *caller = NULL;
int result = BADGE_ERROR_NONE;
- bool existing = false;
if (app_id == NULL)
return BADGE_ERROR_INVALID_PARAMETER;
@@ -181,7 +179,6 @@ int badge_set_display(const char *app_id, unsigned int is_display)
{
char *caller = NULL;
int result = BADGE_ERROR_NONE;
- bool existing = false;
if (app_id == NULL)
return BADGE_ERROR_INVALID_PARAMETER;
diff --git a/src/badge_internal.c b/src/badge_internal.c
index 1b5831f..28725bb 100755
--- a/src/badge_internal.c
+++ b/src/badge_internal.c
@@ -312,7 +312,6 @@ int _badge_is_existing(const char *pkgname, bool *existing)
{
sqlite3 *db = NULL;
int sqlret;
- int ret = BADGE_ERROR_NONE;
int result = BADGE_ERROR_NONE;
if (!pkgname || !existing) {
@@ -329,18 +328,19 @@ int _badge_is_existing(const char *pkgname, bool *existing)
}
result = _badge_check_data_inserted(pkgname, db);
- if (result == BADGE_ERROR_ALREADY_EXIST)
+ if (result == BADGE_ERROR_ALREADY_EXIST) {
*existing = TRUE;
- else if (result == BADGE_ERROR_NOT_EXIST)
+ result = BADGE_ERROR_NONE;
+ } else if (result == BADGE_ERROR_NOT_EXIST) {
*existing = FALSE;
- else
- ret = result;
+ result = BADGE_ERROR_NONE;
+ }
sqlret = db_util_close(db);
if (sqlret != SQLITE_OK)
WARN("fail to db_util_close - [%d]", sqlret);
- return BADGE_ERROR_NONE;
+ return result;
}
int _badge_foreach_existed(badge_foreach_cb callback, void *data)