From a7fd3d6024f79903aedd65a360be42d06bd9da2e Mon Sep 17 00:00:00 2001 From: Myungki Lee Date: Fri, 1 Sep 2017 17:30:04 +0900 Subject: [PATCH] Modify logs Change-Id: Ic177a876255f594952da2c7825fbb39983d0f9d0 Signed-off-by: Myungki Lee --- src/badge_db.c | 21 +++---- src/badge_internal.c | 150 +++++++++++++++++++++----------------------- src/badge_ipc.c | 64 +++++++++---------- src/badge_setting_service.c | 56 ++++++++++------- 4 files changed, 148 insertions(+), 143 deletions(-) diff --git a/src/badge_db.c b/src/badge_db.c index 9bdf3bf..619f3f2 100755 --- a/src/badge_db.c +++ b/src/badge_db.c @@ -108,7 +108,7 @@ int badge_db_insert(const char *pkgname, const char *writable_pkg, const char *c pkgs = _badge_pkgs_new(&err, writable_pkg, caller, NULL); if (!pkgs) { - ERR("fail to _badge_pkgs_new : %d", err); + ERR("Failed to _badge_pkgs_new [%d]", err); return err; } @@ -116,7 +116,7 @@ int badge_db_insert(const char *pkgname, const char *writable_pkg, const char *c badge = _badge_new(pkgname, pkgs, &err); if (!badge) { - ERR("fail to _badge_new : %d", err); + ERR("Failed to _badge_new [%d]", err); free(pkgs); return err; } @@ -124,7 +124,7 @@ int badge_db_insert(const char *pkgname, const char *writable_pkg, const char *c err = _badge_insert(badge, uid); if (err != BADGE_ERROR_NONE) { - ERR("fail to _badge_insert : %d", err); + ERR("Failed to _badge_insert [%d]", err); _badge_free(badge); return err; } @@ -173,19 +173,16 @@ int badge_db_get_display_option(const char *pkgname, unsigned int *is_display, u EXPORT_API int badge_db_exec(sqlite3 *db, const char *query, int *num_changes) { - int ret = 0; + int ret; sqlite3_stmt *stmt = NULL; - if (db == NULL) - return BADGE_ERROR_INVALID_PARAMETER; - - if (query == NULL) + if (db == NULL || query == NULL) return BADGE_ERROR_INVALID_PARAMETER; ret = sqlite3_prepare_v2(db, query, strlen(query), &stmt, NULL); if (ret != SQLITE_OK) { - ERR("DB err(%d) : %s", ret, - sqlite3_errmsg(db)); + ERR("sqlite3_prepare_v2 failed [%d][%s]", ret, + sqlite3_errmsg(db)); return BADGE_ERROR_FROM_DB; } @@ -197,8 +194,8 @@ int badge_db_exec(sqlite3 *db, const char *query, int *num_changes) sqlite3_finalize(stmt); } else { - ERR("DB err(%d) : %s", ret, - sqlite3_errmsg(db)); + ERR("sqlite3_step failed [%d][%s]", ret, + sqlite3_errmsg(db)); sqlite3_finalize(stmt); return BADGE_ERROR_FROM_DB; } diff --git a/src/badge_internal.c b/src/badge_internal.c index 570b2f9..7a63b1f 100755 --- a/src/badge_internal.c +++ b/src/badge_internal.c @@ -83,7 +83,7 @@ char *_badge_get_pkgname_by_pid(void) pkgname = malloc(max); if (!pkgname) { /* LCOV_EXCL_START */ - ERR("fail to alloc memory"); + ERR("Failed to alloc memory"); return NULL; /* LCOV_EXCL_STOP */ } @@ -130,10 +130,7 @@ static int _badge_check_data_inserted(const char *pkgname, char *sqlbuf = NULL; int sqlret; - if (!pkgname) - return BADGE_ERROR_INVALID_PARAMETER; - - if (!db) + if (!pkgname || !db) return BADGE_ERROR_INVALID_PARAMETER; sqlbuf = sqlite3_mprintf("SELECT count(*) FROM %q WHERE " \ @@ -142,7 +139,7 @@ static int _badge_check_data_inserted(const char *pkgname, if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc sql query"); + ERR("Failed to alloc query"); return BADGE_ERROR_OUT_OF_MEMORY; /* LCOV_EXCL_STOP */ } @@ -150,8 +147,8 @@ static int _badge_check_data_inserted(const char *pkgname, sqlret = sqlite3_prepare_v2(db, sqlbuf, -1, &stmt, NULL); if (sqlret != SQLITE_OK) { /* LCOV_EXCL_START */ - ERR("DB err [%s]", sqlite3_errmsg(db)); - ERR("query[%s]", sqlbuf); + ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlret, + sqlite3_errmsg(db)); result = BADGE_ERROR_FROM_DB; goto free_and_return; /* LCOV_EXCL_STOP */ @@ -189,10 +186,7 @@ static int _badge_check_option_inserted(const char *pkgname, char *sqlbuf = NULL; int sqlret; - if (!pkgname) - return BADGE_ERROR_INVALID_PARAMETER; - - if (!db) + if (!pkgname || !db) return BADGE_ERROR_INVALID_PARAMETER; sqlbuf = sqlite3_mprintf("SELECT count(*) FROM %q WHERE " \ @@ -201,7 +195,7 @@ static int _badge_check_option_inserted(const char *pkgname, if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc sql query"); + ERR("Failed to alloc query"); return BADGE_ERROR_OUT_OF_MEMORY; /* LCOV_EXCL_STOP */ } @@ -209,8 +203,8 @@ static int _badge_check_option_inserted(const char *pkgname, sqlret = sqlite3_prepare_v2(db, sqlbuf, -1, &stmt, NULL); if (sqlret != SQLITE_OK) { /* LCOV_EXCL_START */ - ERR("DB err [%s]", sqlite3_errmsg(db)); - ERR("query[%s]", sqlbuf); + ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlret, + sqlite3_errmsg(db)); result = BADGE_ERROR_FROM_DB; goto free_and_return; /* LCOV_EXCL_STOP */ @@ -312,14 +306,14 @@ static int _badge_check_writable(const char *caller, BADGE_TABLE_NAME, pkgname, caller, uid); if (!sqlbuf) { - ERR("fail to alloc sql query"); + ERR("Failed to alloc query"); return BADGE_ERROR_OUT_OF_MEMORY; } sqlret = sqlite3_prepare_v2(db, sqlbuf, -1, &stmt, NULL); if (sqlret != SQLITE_OK) { - ERR("DB err [%s]", sqlite3_errmsg(db)); - ERR("query[%s]", sqlbuf); + ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlret, + sqlite3_errmsg(db)); result = BADGE_ERROR_FROM_DB; goto free_and_return; } @@ -362,7 +356,7 @@ int _badge_is_existing(const char *pkgname, bool *existing, uid_t uid) sqlret = db_util_open(BADGE_DB_PATH, &db, 0); if (sqlret != SQLITE_OK || !db) { /* LCOV_EXCL_START */ - ERR("fail to db_util_open - [%d]", sqlret); + ERR("Failed to db_util_open [%d]", sqlret); if (sqlret == SQLITE_PERM) return BADGE_ERROR_PERMISSION_DENIED; return BADGE_ERROR_FROM_DB; @@ -380,7 +374,7 @@ int _badge_is_existing(const char *pkgname, bool *existing, uid_t uid) sqlret = db_util_close(db); if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); /* LCOV_EXCL_LINE */ + WARN("Failed to db_util_close [%d]", sqlret); /* LCOV_EXCL_LINE */ return result; } @@ -399,7 +393,7 @@ int _badge_get_list(GList **badge_list, uid_t uid) sqlret = db_util_open(BADGE_DB_PATH, &db, 0); if (sqlret != SQLITE_OK || !db) { /* LCOV_EXCL_START */ - ERR("fail to db_util_open - [%d]", sqlret); + ERR("Failed to db_util_open [%d]", sqlret); return BADGE_ERROR_FROM_DB; /* LCOV_EXCL_STOP */ } @@ -408,7 +402,7 @@ int _badge_get_list(GList **badge_list, uid_t uid) BADGE_TABLE_NAME, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc sql query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto free_and_return; /* LCOV_EXCL_STOP */ @@ -417,8 +411,8 @@ int _badge_get_list(GList **badge_list, uid_t uid) sqlret = sqlite3_prepare_v2(db, sqlbuf, -1, &stmt, NULL); if (sqlret != SQLITE_OK) { /* LCOV_EXCL_START */ - ERR("fail to sqlite3_prepare_v2 - [%s]", sqlite3_errmsg(db)); - ERR("query[%s]", sqlbuf); + ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlret, + sqlite3_errmsg(db)); result = BADGE_ERROR_FROM_DB; goto free_and_return; /* LCOV_EXCL_STOP */ @@ -430,7 +424,7 @@ int _badge_get_list(GList **badge_list, uid_t uid) result = BADGE_ERROR_NOT_EXIST; goto free_and_return; } else if (sqlret != SQLITE_ROW) { - ERR("fail to sqlite3_step : %d", sqlret); + ERR("Failed to sqlite3_step [%d]", sqlret); result = BADGE_ERROR_FROM_DB; goto free_and_return; } @@ -442,7 +436,7 @@ int _badge_get_list(GList **badge_list, uid_t uid) badge_info = (badge_info_s *)calloc(sizeof(badge_info_s), 1); if (badge_info == NULL) { /* LCOV_EXCL_START */ - ERR("alloc badge_info fail"); + ERR("alloc badge_info failed"); result = BADGE_ERROR_OUT_OF_MEMORY; break; /* LCOV_EXCL_STOP */ @@ -467,7 +461,7 @@ free_and_return: sqlret = db_util_close(db); if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); /* LCOV_EXCL_LINE */ + WARN("Failed to db_util_close [%d]", sqlret); /* LCOV_EXCL_LINE */ return result; } @@ -486,7 +480,7 @@ int _badge_insert(badge_h *badge, uid_t uid) sqlret = db_util_open(BADGE_DB_PATH, &db, 0); if (sqlret != SQLITE_OK || !db) { /* LCOV_EXCL_START */ - ERR("fail to db_util_open - [%s][%d]", BADGE_DB_PATH, sqlret); + ERR("Failed to db_util_open [%s][%d]", BADGE_DB_PATH, sqlret); return BADGE_ERROR_FROM_DB; /* LCOV_EXCL_STOP */ } @@ -510,7 +504,7 @@ int _badge_insert(badge_h *badge, uid_t uid) badge->pkgname, badge->writable_pkgs, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -519,7 +513,7 @@ int _badge_insert(badge_h *badge, uid_t uid) ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("failed to insert badge[%s], err[%d]", + ERR("Failed to insert badge[%s], err[%d]", badge->pkgname, ret); result = ret; goto return_close_db; @@ -542,7 +536,7 @@ int _badge_insert(badge_h *badge, uid_t uid) badge->pkgname, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -551,7 +545,7 @@ int _badge_insert(badge_h *badge, uid_t uid) ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("failed to insert badge option[%s], err[%d]", + ERR("Failed to insert badge option[%s], err[%d]", badge->pkgname, sqlret); result = ret; goto return_close_db; @@ -564,7 +558,7 @@ return_close_db: sqlret = db_util_close(db); if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); /* LCOV_EXCL_LINE */ + WARN("Failed to db_util_close [%d]", sqlret); /* LCOV_EXCL_LINE */ return result; } @@ -583,7 +577,7 @@ int _badge_remove(const char *caller, const char *pkgname, uid_t uid, pid_t pid) sqlret = db_util_open(BADGE_DB_PATH, &db, 0); if (sqlret != SQLITE_OK || !db) { /* LCOV_EXCL_START */ - ERR("fail to db_util_open - [%d]", sqlret); + ERR("Failed to db_util_open [%d]", sqlret); return BADGE_ERROR_FROM_DB; /* LCOV_EXCL_STOP */ } @@ -604,7 +598,7 @@ int _badge_remove(const char *caller, const char *pkgname, uid_t uid, pid_t pid) BADGE_TABLE_NAME, pkgname, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -612,7 +606,7 @@ int _badge_remove(const char *caller, const char *pkgname, uid_t uid, pid_t pid) ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { - ERR("failed to remove badge[%s], err[%d]", + ERR("Failed to remove badge[%s], err[%d]", pkgname, ret); result = ret; goto return_close_db; @@ -629,7 +623,7 @@ int _badge_remove(const char *caller, const char *pkgname, uid_t uid, pid_t pid) BADGE_OPTION_TABLE_NAME, pkgname, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -638,7 +632,7 @@ int _badge_remove(const char *caller, const char *pkgname, uid_t uid, pid_t pid) ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("failed to remove badge option[%s], err[%d]", + ERR("Failed to remove badge option[%s], err[%d]", pkgname, ret); result = ret; goto return_close_db; @@ -651,7 +645,7 @@ return_close_db: sqlret = db_util_close(db); if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); /* LCOV_EXCL_LINE */ + WARN("Failed to db_util_close [%d]", sqlret); /* LCOV_EXCL_LINE */ return result; } @@ -672,7 +666,7 @@ static int _badge_remove_by_appid(const char *appid, uid_t uid, sqlite3 *db) BADGE_TABLE_NAME, appid, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -680,7 +674,7 @@ static int _badge_remove_by_appid(const char *appid, uid_t uid, sqlite3 *db) ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { - ERR("failed to remove badge[%s], err[%d]", + ERR("Failed to remove badge[%s], err[%d]", appid, ret); result = ret; goto return_close_db; @@ -697,7 +691,7 @@ static int _badge_remove_by_appid(const char *appid, uid_t uid, sqlite3 *db) BADGE_OPTION_TABLE_NAME, appid, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -706,7 +700,7 @@ static int _badge_remove_by_appid(const char *appid, uid_t uid, sqlite3 *db) ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("failed to remove badge option[%s], err[%d]", + ERR("Failed to remove badge option[%s], err[%d]", appid, ret); result = ret; goto return_close_db; @@ -781,14 +775,15 @@ int _badge_remove_by_pkgname(const char *pkgname, uid_t uid) BADGE_SETTING_DB_TABLE, pkgname, uid, tzplatform_getuid(TZ_SYS_GLOBALAPP_USER)); if (!sql_query) { - ERR("fail to alloc query"); + ERR("Failed to alloc query"); ret = BADGE_ERROR_FROM_DB; goto out; } sql_ret = sqlite3_get_table(db, sql_query, &query_result, &row_count, &col_count, NULL); if (sql_ret != SQLITE_OK && sql_ret != -1) { - ERR("sqlite3_get_table failed [%d][%s]", sql_ret, sql_query); + ERR("sqlite3_get_table failed [%d][%s]", sql_ret, + sqlite3_errmsg(db)); ret = BADGE_ERROR_FROM_DB; goto out; } @@ -818,7 +813,7 @@ out: if (db) { sql_ret = db_util_close(db); if (sql_ret != SQLITE_OK) - WARN("fail to db_util_close"); + WARN("Failed to db_util_close"); } return ret; @@ -839,7 +834,7 @@ int _badge_set_count(const char *caller, const char *pkgname, sqlret = db_util_open(BADGE_DB_PATH, &db, 0); if (sqlret != SQLITE_OK || !db) { /* LCOV_EXCL_START */ - ERR("fail to db_util_open - [%d]", sqlret); + ERR("Failed to db_util_open [%d]", sqlret); return BADGE_ERROR_FROM_DB; /* LCOV_EXCL_STOP */ } @@ -861,7 +856,7 @@ int _badge_set_count(const char *caller, const char *pkgname, BADGE_TABLE_NAME, count, pkgname, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -870,7 +865,7 @@ int _badge_set_count(const char *caller, const char *pkgname, ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("failed to set badge[%s] count[%d], err[%d]", + ERR("Failed to set badge[%s] count[%d], err[%d]", pkgname, count, ret); result = ret; goto return_close_db; @@ -883,7 +878,7 @@ return_close_db: sqlret = db_util_close(db); if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); /* LCOV_EXCL_LINE */ + WARN("Failed to db_util_close [%d]", sqlret); /* LCOV_EXCL_LINE */ return result; } @@ -903,7 +898,7 @@ int _badge_get_count(const char *pkgname, unsigned int *count, uid_t uid) sqlret = db_util_open(BADGE_DB_PATH, &db, 0); if (sqlret != SQLITE_OK || !db) { /* LCOV_EXCL_START */ - ERR("fail to db_util_open - [%d]", sqlret); + ERR("Failed to db_util_open [%d]", sqlret); if (sqlret == SQLITE_PERM) return BADGE_ERROR_PERMISSION_DENIED; else @@ -922,7 +917,7 @@ int _badge_get_count(const char *pkgname, unsigned int *count, uid_t uid) BADGE_TABLE_NAME, pkgname, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -931,8 +926,8 @@ int _badge_get_count(const char *pkgname, unsigned int *count, uid_t uid) sqlret = sqlite3_prepare_v2(db, sqlbuf, -1, &stmt, NULL); if (sqlret != SQLITE_OK) { /* LCOV_EXCL_START */ - ERR("fail to prepare %s - [%s]", - sqlbuf, sqlite3_errmsg(db)); + ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlret, + sqlite3_errmsg(db)); result = BADGE_ERROR_FROM_DB; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -953,7 +948,7 @@ return_close_db: sqlret = db_util_close(db); if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); /* LCOV_EXCL_LINE */ + WARN("Failed to db_util_close [%d]", sqlret); /* LCOV_EXCL_LINE */ return result; } @@ -975,7 +970,7 @@ int _badge_set_display(const char *pkgname, unsigned int is_display, uid_t uid) sqlret = db_util_open(BADGE_DB_PATH, &db, 0); if (sqlret != SQLITE_OK || !db) { /* LCOV_EXCL_START */ - ERR("fail to db_util_open - [%d]", sqlret); + ERR("Failed to db_util_open [%d]", sqlret); return BADGE_ERROR_FROM_DB; /* LCOV_EXCL_STOP */ } @@ -993,7 +988,7 @@ int _badge_set_display(const char *pkgname, unsigned int is_display, uid_t uid) BADGE_OPTION_TABLE_NAME, is_display, pkgname, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -1002,7 +997,7 @@ int _badge_set_display(const char *pkgname, unsigned int is_display, uid_t uid) ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("failed to set badge[%s] option[%d], err[%d]", + ERR("Failed to set badge[%s] option[%d], err[%d]", pkgname, is_display, ret); result = ret; goto return_close_db; @@ -1020,7 +1015,7 @@ int _badge_set_display(const char *pkgname, unsigned int is_display, uid_t uid) pkgname, is_display, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -1029,7 +1024,7 @@ int _badge_set_display(const char *pkgname, unsigned int is_display, uid_t uid) ret = badge_db_exec(db, sqlbuf, NULL); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("failed to set badge[%s] option[%d], err[%d]", + ERR("Failed to set badge[%s] option[%d], err[%d]", pkgname, is_display, ret); result = ret; goto return_close_db; @@ -1046,7 +1041,7 @@ return_close_db: sqlret = db_util_close(db); if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); /* LCOV_EXCL_LINE */ + WARN("Failed to db_util_close [%d]", sqlret); /* LCOV_EXCL_LINE */ return result; } @@ -1066,7 +1061,7 @@ int _badge_get_display(const char *pkgname, unsigned int *is_display, uid_t uid) sqlret = db_util_open(BADGE_DB_PATH, &db, 0); if (sqlret != SQLITE_OK || !db) { /* LCOV_EXCL_START */ - ERR("fail to db_util_open - [%d]", sqlret); + ERR("Failed to db_util_open [%d]", sqlret); if (sqlret == SQLITE_PERM) return BADGE_ERROR_PERMISSION_DENIED; else @@ -1088,7 +1083,7 @@ int _badge_get_display(const char *pkgname, unsigned int *is_display, uid_t uid) BADGE_OPTION_TABLE_NAME, pkgname, uid); if (!sqlbuf) { /* LCOV_EXCL_START */ - ERR("fail to alloc query"); + ERR("Failed to alloc query"); result = BADGE_ERROR_OUT_OF_MEMORY; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -1097,8 +1092,7 @@ int _badge_get_display(const char *pkgname, unsigned int *is_display, uid_t uid) sqlret = sqlite3_prepare_v2(db, sqlbuf, -1, &stmt, NULL); if (sqlret != SQLITE_OK) { /* LCOV_EXCL_START */ - ERR("fail to prepare %s - [%s]", - sqlbuf, sqlite3_errmsg(db)); + ERR("Failed to prepare [%d][%s]", sqlret, sqlite3_errmsg(db)); result = BADGE_ERROR_FROM_DB; goto return_close_db; /* LCOV_EXCL_STOP */ @@ -1119,7 +1113,7 @@ return_close_db: sqlret = db_util_close(db); if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); /* LCOV_EXCL_LINE */ + WARN("Failed to db_util_close [%d]", sqlret); /* LCOV_EXCL_LINE */ return result; } @@ -1184,7 +1178,7 @@ static struct _badge_cb_data *__malloc_badge_cb_data(badge_change_cb callback, v struct _badge_cb_data *bd = NULL; bd = (struct _badge_cb_data *)malloc(sizeof(struct _badge_cb_data)); if (bd == NULL) { - ERR("failed malloc badge_cb_data"); + ERR("Failed malloc badge_cb_data"); return NULL; } @@ -1224,7 +1218,7 @@ badge_h *_badge_new(const char *pkgname, const char *writable_pkgs, badge = (badge_h *)malloc(sizeof(struct _badge_h)); if (!badge) { - ERR("fail to alloc handle"); + ERR("Failed to alloc handle"); if (err) *err = BADGE_ERROR_OUT_OF_MEMORY; return NULL; @@ -1253,7 +1247,7 @@ char *_badge_pkgs_new(int *err, const char *pkg1, ...) caller_pkgname = _badge_get_pkgname_by_pid(); if (!caller_pkgname) { - ERR("fail to get caller pkgname"); + ERR("Failed to get caller pkgname"); if (err) *err = BADGE_ERROR_PERMISSION_DENIED; return NULL; @@ -1281,7 +1275,7 @@ char *_badge_pkgs_new(int *err, const char *pkg1, ...) result = g_new0(char, length + 1); /* 1 for null terminate */ if (!result) { /* LCOV_EXCL_START */ - ERR("fail to alloc memory"); + ERR("Failed to alloc memory"); if (err) *err = BADGE_ERROR_OUT_OF_MEMORY; free(caller_pkgname); @@ -1302,7 +1296,7 @@ char *_badge_pkgs_new(int *err, const char *pkg1, ...) if (g_strstr_len(result, -1, caller_pkgname) == NULL) { new_pkgs = g_strdup_printf("%s%s", caller_pkgname, result); if (!new_pkgs) { - ERR("fail to alloc memory"); + ERR("Failed to alloc memory"); if (err) *err = BADGE_ERROR_OUT_OF_MEMORY; @@ -1328,7 +1322,7 @@ int badge_create_for_uid(const char *pkgname, const char *writable_pkg, uid_t ui caller = _badge_get_pkgname_by_pid(); if (!caller) { - ERR("fail to get caller pkgname"); + ERR("Failed to get caller pkgname"); return BADGE_ERROR_PERMISSION_DENIED; } @@ -1347,7 +1341,7 @@ int badge_new_for_uid(const char *writable_app_id, uid_t uid) caller = _badge_get_pkgname_by_pid(); if (!caller) { - ERR("fail to get caller pkgname"); + ERR("Failed to get caller pkgname"); return BADGE_ERROR_PERMISSION_DENIED; } @@ -1366,7 +1360,7 @@ int badge_add_for_uid(const char *badge_app_id, uid_t uid) caller = _badge_get_pkgname_by_pid(); if (!caller) { - ERR("fail to get caller pkgname"); + ERR("Failed to get caller pkgname"); return BADGE_ERROR_PERMISSION_DENIED; } @@ -1401,7 +1395,7 @@ int badge_remove_for_uid(const char *app_id, uid_t uid) caller = _badge_get_pkgname_by_pid(); if (!caller) { - ERR("fail to get caller pkgname"); + ERR("Failed to get caller pkgname"); result = BADGE_ERROR_PERMISSION_DENIED; goto out; } @@ -1443,7 +1437,7 @@ int badge_set_count_for_uid(const char *app_id, unsigned int count, uid_t uid) caller = _badge_get_pkgname_by_pid(); if (!caller) { - ERR("fail to get caller pkgname"); + ERR("Failed to get caller pkgname"); result = BADGE_ERROR_PERMISSION_DENIED; goto out; } @@ -1477,7 +1471,7 @@ int badge_set_display_for_uid(const char *app_id, unsigned int is_display, uid_t caller = _badge_get_pkgname_by_pid(); if (!caller) { - ERR("fail to get caller pkgname"); + ERR("Failed to get caller pkgname"); result = BADGE_ERROR_PERMISSION_DENIED; goto out; } @@ -1547,7 +1541,7 @@ int badge_register_changed_cb_for_uid(badge_change_cb callback, void *data, uid_ } } else { /* LCOV_EXCL_START */ - ERR("badge_ipc_monitor_init err : %d", ret); + ERR("badge_ipc_monitor_init err [%d]", ret); badge_unregister_changed_cb_for_uid(callback, uid); return ret; /* LCOV_EXCL_STOP */ diff --git a/src/badge_ipc.c b/src/badge_ipc.c index d7d41d2..55eb317 100755 --- a/src/badge_ipc.c +++ b/src/badge_ipc.c @@ -76,7 +76,7 @@ int badge_ipc_is_master_ready(void) if (err || (result == NULL)) { /* LCOV_EXCL_START */ if (err) { - ERR("No reply. error = %s", err->message); + ERR("No reply. error [%s]", err->message); g_error_free(err); } is_master_started = 0; @@ -86,7 +86,7 @@ int badge_ipc_is_master_ready(void) if (!name_exist) { /* LCOV_EXCL_START */ - ERR("Name not exist %s", PROVIDER_BUS_NAME); + ERR("Name not exist [%s]", PROVIDER_BUS_NAME); ERR("the master has been stopped"); is_master_started = 0; /* LCOV_EXCL_STOP */ @@ -441,7 +441,7 @@ int badge_ipc_monitor_init(uid_t uid) ret = _dbus_init(); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("Can't init dbus %d", ret); + ERR("Can't init dbus [%d]", ret); return ret; /* LCOV_EXCL_STOP */ } @@ -449,7 +449,7 @@ int badge_ipc_monitor_init(uid_t uid) ret = _dbus_signal_init(); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("Can't init dbus signal %d", ret); + ERR("Can't init dbus signal [%d]", ret); return ret; /* LCOV_EXCL_STOP */ } @@ -457,7 +457,7 @@ int badge_ipc_monitor_init(uid_t uid) ret = _ipc_monitor_register(uid); if (ret != BADGE_ERROR_NONE) { /* LCOV_EXCL_START */ - ERR("Can't init ipc_monitor_register %d", ret); + ERR("Can't init ipc_monitor_register [%d]", ret); return ret; /* LCOV_EXCL_STOP */ } @@ -474,7 +474,7 @@ int badge_ipc_monitor_init(uid_t uid) if (provider_monitor_id == 0) { /* LCOV_EXCL_START */ - ERR("watch on name fail"); + ERR("watch on name failed"); g_dbus_connection_signal_unsubscribe(_gdbus_conn, monitor_id); monitor_id = 0; return BADGE_ERROR_IO_ERROR; @@ -509,7 +509,7 @@ int badge_ipc_request_is_existing(const char *pkgname, bool *existing, uid_t uid result = _dbus_init(); if (result != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", result); + ERR("Can't init dbus [%d]", result); return result; } body = g_variant_new("(si)", pkgname, uid); @@ -524,7 +524,7 @@ int badge_ipc_request_is_existing(const char *pkgname, bool *existing, uid_t uid if (reply) g_object_unref(reply); - DBG("badge_ipc_request_is_existing done [result: %d]", result); + DBG("badge_ipc_request_is_existing done [%d]", result); return result; } @@ -540,13 +540,13 @@ int badge_ipc_request_get_list(badge_foreach_cb callback, void *data, uid_t uid) result = _dbus_init(); if (result != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", result); + ERR("Can't init dbus [%d]", result); return result; } body = g_variant_new("(i)", uid); if (!body) { - ERR("Cannot create gvariant. Out of memory."); + ERR("Can't create gvariant. Out of memory."); return BADGE_ERROR_OUT_OF_MEMORY; } @@ -576,13 +576,13 @@ int badge_ipc_request_insert(const char *pkgname, const char *writable_pkg, cons result = _dbus_init(); if (result != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", result); + ERR("Can't init dbus [%d]", result); return result; } body = g_variant_new("(sssi)", pkgname, writable_pkg, caller, uid); if (!body) { - ERR("Cannot create gvariant. Out of memory."); + ERR("Can't create gvariant. Out of memory."); return BADGE_ERROR_OUT_OF_MEMORY; } @@ -591,7 +591,7 @@ int badge_ipc_request_insert(const char *pkgname, const char *writable_pkg, cons if (reply) g_object_unref(reply); - DBG("badge_ipc_request_insert done [result: %d]", result); + DBG("badge_ipc_request_insert done [%d]", result); return result; } @@ -603,13 +603,13 @@ int badge_ipc_request_delete(const char *pkgname, const char *caller, uid_t uid) result = _dbus_init(); if (result != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", result); + ERR("Can't init dbus [%d]", result); return result; } body = g_variant_new("(ssi)", pkgname, caller, uid); if (!body) { - ERR("Cannot create gvariant. Out of memory."); + ERR("Can't create gvariant. Out of memory."); return BADGE_ERROR_OUT_OF_MEMORY; } @@ -618,7 +618,7 @@ int badge_ipc_request_delete(const char *pkgname, const char *caller, uid_t uid) if (reply) g_object_unref(reply); - DBG("badge_ipc_request_delete done [result: %d]", result); + DBG("badge_ipc_request_delete done [%d]", result); return result; } @@ -630,13 +630,13 @@ int badge_ipc_request_set_count(const char *pkgname, const char *caller, int cou result = _dbus_init(); if (result != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", result); + ERR("Can't init dbus [%d]", result); return result; } body = g_variant_new("(ssii)", pkgname, caller, count, uid); if (!body) { - ERR("Cannot create gvariant. Out of memory."); + ERR("Can't create gvariant. Out of memory."); return BADGE_ERROR_OUT_OF_MEMORY; } @@ -645,7 +645,7 @@ int badge_ipc_request_set_count(const char *pkgname, const char *caller, int cou if (reply) g_object_unref(reply); - DBG("badge_ipc_request_set_count done [result: %d]", result); + DBG("badge_ipc_request_set_count done [%d]", result); return result; } @@ -659,13 +659,13 @@ int badge_ipc_request_get_count(const char *pkgname, unsigned int *count, uid_t result = _dbus_init(); if (result != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", result); + ERR("Can't init dbus [%d]", result); return result; } body = g_variant_new("(si)", pkgname, uid); if (!body) { - ERR("Cannot create gvariant. Out of memory."); + ERR("Can't create gvariant. Out of memory."); return BADGE_ERROR_OUT_OF_MEMORY; } @@ -679,7 +679,7 @@ int badge_ipc_request_get_count(const char *pkgname, unsigned int *count, uid_t if (reply) g_object_unref(reply); - DBG("badge_ipc_request_get_count done [result: %d]", result); + DBG("badge_ipc_request_get_count done [%d]", result); return result; } @@ -692,12 +692,12 @@ int badge_ipc_request_set_display(const char *pkgname, const char *caller, result = _dbus_init(); if (result != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", result); + ERR("Can't init dbus [%d]", result); return result; } body = g_variant_new("(ssii)", pkgname, caller, display_option, uid); if (!body) { - ERR("Cannot create gvariant. Out of memory."); + ERR("Can't create gvariant. Out of memory."); return BADGE_ERROR_OUT_OF_MEMORY; } @@ -705,7 +705,7 @@ int badge_ipc_request_set_display(const char *pkgname, const char *caller, if (reply) g_object_unref(reply); - DBG("badge_ipc_request_set_display done [result: %d]", result); + DBG("badge_ipc_request_set_display done [%d]", result); return result; } @@ -719,13 +719,13 @@ int badge_ipc_request_get_display(const char *pkgname, unsigned int *is_display, result = _dbus_init(); if (result != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", result); + ERR("Can't init dbus [%d]", result); return result; } body = g_variant_new("(si)", pkgname, uid); if (!body) { - ERR("Cannot create gvariant. Out of memory."); + ERR("Can't create gvariant. Out of memory."); return BADGE_ERROR_OUT_OF_MEMORY; } @@ -739,7 +739,7 @@ int badge_ipc_request_get_display(const char *pkgname, unsigned int *is_display, if (reply) g_object_unref(reply); - DBG("badge_ipc_request_get_display done [result: %d]", result); + DBG("badge_ipc_request_get_display done [%d]", result); return result; } @@ -751,7 +751,7 @@ int badge_ipc_request_update_setting(badge_setting_h setting, uid_t uid) ret = _dbus_init(); if (ret != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", ret); + ERR("Can't init dbus [%d]", ret); return ret; } @@ -782,7 +782,7 @@ int badge_ipc_request_get_setting_by_appid(badge_setting_h *setting, const char ret = _dbus_init(); if (ret != BADGE_ERROR_NONE) { - ERR("Can't init dbus %d", ret); + ERR("Can't init dbus [%d]", ret); return ret; } @@ -850,7 +850,7 @@ int badge_ipc_init_badge(uid_t uid) body = g_variant_new("(i)", uid); if (!body) { - ERR("Cannot create gvariant."); + ERR("Can't create gvariant."); return BADGE_ERROR_OUT_OF_MEMORY; } @@ -859,6 +859,6 @@ int badge_ipc_init_badge(uid_t uid) if (reply) g_object_unref(reply); - DBG("badge_ipc_init_badge done[result:%d]", ret); + DBG("badge_ipc_init_badge done[%d]", ret); return ret; } diff --git a/src/badge_setting_service.c b/src/badge_setting_service.c index 813ccf0..706cc05 100644 --- a/src/badge_setting_service.c +++ b/src/badge_setting_service.c @@ -118,14 +118,15 @@ EXPORT_API int badge_db_get_setting_by_appid(const char *appid, badge_setting_h "ORDER BY uid DESC;", BADGE_SETTING_DB_TABLE, appid, uid, tzplatform_getuid(TZ_SYS_GLOBALAPP_USER)); if (!sql_query) { - ERR("fail to alloc query"); + ERR("Failed to alloc query"); ret = BADGE_ERROR_FROM_DB; goto out; } sql_ret = sqlite3_get_table(db, sql_query, &query_result, &row_count, &col_count, NULL); if (sql_ret != SQLITE_OK && sql_ret != -1) { - ERR("sqlite3_get_table failed [%d][%s]", sql_ret, sql_query); + ERR("sqlite3_get_table failed [%d][%s]", sql_ret, + sqlite3_errmsg(db)); ret = BADGE_ERROR_FROM_DB; goto out; } @@ -138,7 +139,7 @@ EXPORT_API int badge_db_get_setting_by_appid(const char *appid, badge_setting_h result_setting = (struct badge_setting *)malloc(sizeof(struct badge_setting)); if (result_setting == NULL) { - ERR("fail to alloc setting"); + ERR("Failed to alloc setting"); ret = BADGE_ERROR_OUT_OF_MEMORY; goto out; } @@ -159,7 +160,7 @@ out: if (db) { sql_ret = db_util_close(db); if (sql_ret != SQLITE_OK) - WARN("fail to db_util_close"); + WARN("Failed to db_util_close"); } return ret; @@ -190,7 +191,7 @@ EXPORT_API int badge_db_update_setting(char *pkgname, char *appid, int allow_to_ pkgname, appid, uid); if (!sqlbuf) { - ERR("fail to alloc query"); + ERR("Failed to alloc query"); ret = BADGE_ERROR_FROM_DB; goto out; } @@ -203,7 +204,7 @@ out: if (db) { sql_ret = db_util_close(db); if (sql_ret != SQLITE_OK) - WARN("fail to db_util_close"); + WARN("Failed to db_util_close"); } return ret; @@ -234,14 +235,15 @@ EXPORT_API int badge_db_get_allow_to_display_by_appid(char *appid, int *allow_to BADGE_SETTING_DB_TABLE, appid, uid, tzplatform_getuid(TZ_SYS_GLOBALAPP_USER)); if (!sql_query) { - ERR("fail to alloc query"); + ERR("Failed to alloc query"); ret = BADGE_ERROR_FROM_DB; goto out; } sql_ret = sqlite3_get_table(db, sql_query, &query_result, &row_count, &col_count, NULL); if (sql_ret != SQLITE_OK && sql_ret != -1) { - ERR("sqlite3_get_table failed [%d][%s]", sql_ret, sql_query); + ERR("sqlite3_get_table failed [%d][%s]", sql_ret, + sqlite3_errmsg(db)); ret = BADGE_ERROR_FROM_DB; goto out; } @@ -264,7 +266,7 @@ out: if (db) { sql_ret = db_util_close(db); if (sql_ret != SQLITE_OK) - WARN("fail to db_util_close"); + WARN("Failed to db_util_close"); } return ret; @@ -283,7 +285,8 @@ static bool _is_package_in_setting_table(sqlite3 *db, const char *pkgname, const sqlite3_ret = sqlite3_prepare_v2(db, "SELECT pkgname FROM badge_setting WHERE uid = ? AND pkgname = ?", -1, &db_statement, NULL); if (sqlite3_ret != SQLITE_OK) { - ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlite3_ret, sqlite3_errmsg(db)); + ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlite3_ret, + sqlite3_errmsg(db)); err = false; goto out; } @@ -301,7 +304,8 @@ static bool _is_package_in_setting_table(sqlite3 *db, const char *pkgname, const } if (sqlite3_ret != SQLITE_OK && sqlite3_ret != SQLITE_ROW) { - ERR("sqlite3_step failed [%d][%s]", sqlite3_ret, sqlite3_errmsg(db)); + ERR("sqlite3_step failed [%d][%s]", sqlite3_ret, + sqlite3_errmsg(db)); err = false; goto out; } @@ -346,7 +350,8 @@ static int app_info_callback(const pkgmgrinfo_appinfo_h handle, void *user_data) "VALUES (?, ?, ?) ", -1, &db_statement, NULL); if (sqlite3_ret != SQLITE_OK) { - ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlite3_ret, sqlite3_errmsg(db)); + ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlite3_ret, + sqlite3_errmsg(db)); goto out; } @@ -359,7 +364,8 @@ static int app_info_callback(const pkgmgrinfo_appinfo_h handle, void *user_data) INFO("sqlite3_step returns[%d]", sqlite3_ret); if (sqlite3_ret != SQLITE_OK && sqlite3_ret != SQLITE_DONE) - ERR("sqlite3_step failed [%d][%s]", sqlite3_ret, sqlite3_errmsg(db)); + ERR("sqlite3_step failed [%d][%s]", sqlite3_ret, + sqlite3_errmsg(db)); out: if (db_statement) @@ -389,19 +395,22 @@ static int package_info_callback(const pkgmgrinfo_pkginfo_h package_info, void * pkgmgr_ret = pkgmgrinfo_appinfo_filter_add_string(handle, PMINFO_APPINFO_PROP_APP_PACKAGE, pkgname); if (pkgmgr_ret != PMINFO_R_OK) { - ERR("pkgmgrinfo_appinfo_filter_add_string failed [%d]", pkgmgr_ret); + ERR("pkgmgrinfo_appinfo_filter_add_string failed [%d]", + pkgmgr_ret); goto out; } pkgmgr_ret = pkgmgrinfo_appinfo_filter_add_bool(handle, PMINFO_APPINFO_PROP_APP_NODISPLAY, false); if (pkgmgr_ret != PMINFO_R_OK) { - ERR("pkgmgrinfo_appinfo_filter_add_bool failed [%d]", pkgmgr_ret); + ERR("pkgmgrinfo_appinfo_filter_add_bool failed [%d]", + pkgmgr_ret); goto out; } pkgmgr_ret = pkgmgrinfo_appinfo_usr_filter_foreach_appinfo(handle, app_info_callback, info, info->uid); if (pkgmgr_ret != PMINFO_R_OK) { - ERR("pkgmgrinfo_pkginfo_filter_foreach_appinfo failed [%d]", pkgmgr_ret); + ERR("pkgmgrinfo_pkginfo_filter_foreach_appinfo failed [%d]", + pkgmgr_ret); goto out; } @@ -439,7 +448,8 @@ EXPORT_API int badge_setting_insert_package_for_uid(const char *pkgname, uid_t u pkgmgr_ret = pkgmgrinfo_pkginfo_filter_add_string(handle, PMINFO_PKGINFO_PROP_PACKAGE_ID, pkgname); if (pkgmgr_ret != PMINFO_R_OK) { - ERR("pkgmgrinfo_pkginfo_filter_add_string failed [%d]", pkgmgr_ret); + ERR("pkgmgrinfo_pkginfo_filter_add_string failed [%d]", + pkgmgr_ret); ret = BADGE_ERROR_FROM_DB; goto out; } @@ -448,7 +458,8 @@ EXPORT_API int badge_setting_insert_package_for_uid(const char *pkgname, uid_t u info.uid = uid; pkgmgr_ret = pkgmgrinfo_pkginfo_usr_filter_foreach_pkginfo(handle, package_info_callback, &info, uid); if (pkgmgr_ret != PMINFO_R_OK) { - ERR("pkgmgrinfo_pkginfo_usr_filter_foreach_pkginfo failed [%d]", pkgmgr_ret); + ERR("pkgmgrinfo_pkginfo_usr_filter_foreach_pkginfo failed [%d]", + pkgmgr_ret); ret = BADGE_ERROR_FROM_DB; goto out; } @@ -495,7 +506,8 @@ EXPORT_API int badge_setting_delete_package_for_uid(const char *pkgname, uid_t u sqlite3_ret = sqlite3_prepare_v2(db, "DELETE FROM badge_setting WHERE uid = ? AND pkgname = ? ", -1, &db_statement, NULL); if (sqlite3_ret != SQLITE_OK) { - ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlite3_ret, sqlite3_errmsg(db)); + ERR("sqlite3_prepare_v2 failed [%d][%s]", sqlite3_ret, + sqlite3_errmsg(db)); ret = BADGE_ERROR_FROM_DB; goto out; } @@ -505,7 +517,8 @@ EXPORT_API int badge_setting_delete_package_for_uid(const char *pkgname, uid_t u sqlite3_ret = sqlite3_step(db_statement); if (sqlite3_ret != SQLITE_OK && sqlite3_ret != SQLITE_DONE) { - ERR("sqlite3_step failed [%d][%s]", sqlite3_ret, sqlite3_errmsg(db)); + ERR("sqlite3_step failed [%d][%s]", sqlite3_ret, + sqlite3_errmsg(db)); ret = BADGE_ERROR_FROM_DB; } @@ -553,7 +566,8 @@ EXPORT_API int badge_setting_refresh_setting_table(uid_t uid) info.uid = uid; pkgmgr_ret = pkgmgrinfo_pkginfo_usr_filter_foreach_pkginfo(filter, package_info_callback, &info, uid); if (pkgmgr_ret != PMINFO_R_OK) { - ERR("pkgmgrinfo_pkginfo_usr_filter_foreach_pkginfo failed [%d]", pkgmgr_ret); + ERR("pkgmgrinfo_pkginfo_usr_filter_foreach_pkginfo failed [%d]", + pkgmgr_ret); ret = BADGE_ERROR_FROM_DB; goto out; } -- 2.7.4