From d27d4228891b286de45acbe63599cd2f75b5603c Mon Sep 17 00:00:00 2001 From: "seungha.son" Date: Fri, 16 Dec 2016 19:17:40 +0900 Subject: [PATCH] Remove unused function Signed-off-by: seungha.son Change-Id: I7b08a54cfc274fd286bffb090acd3f3bc8c334c2 --- include/badge_internal.h | 5 -- src/badge_internal.c | 163 ----------------------------------------------- 2 files changed, 168 deletions(-) diff --git a/include/badge_internal.h b/include/badge_internal.h index cd612b1..8d84050 100755 --- a/include/badge_internal.h +++ b/include/badge_internal.h @@ -137,8 +137,6 @@ char *_badge_get_pkgname_by_pid(void); int _badge_is_existing(const char *pkgname, bool *existing, uid_t uid); -int _badge_foreach_existed(badge_foreach_cb callback, void *data, uid_t uid); - int _badge_get_list(GList **badge_list, uid_t uid); int _badge_insert(badge_h *badge, uid_t uid); @@ -165,9 +163,6 @@ badge_h *_badge_new(const char *pkgname, const char *writable_pkgs, char *_badge_pkgs_new(int *err, const char *pkg1, ...); -char *_badge_pkgs_new_valist(int *err, - const char *pkg1, va_list args); - void badge_changed_cb_call(unsigned int action, const char *pkgname, unsigned int count, uid_t uid); diff --git a/src/badge_internal.c b/src/badge_internal.c index 2d658d7..7a1238f 100755 --- a/src/badge_internal.c +++ b/src/badge_internal.c @@ -447,86 +447,6 @@ free_and_return: return result; } -/* LCOV_EXCL_START */ -int _badge_foreach_existed(badge_foreach_cb callback, void *data, uid_t uid) -{ - sqlite3 *db = NULL; - int result = BADGE_ERROR_NONE; - char *sqlbuf = NULL; - sqlite3_stmt *stmt = NULL; - int sqlret; - const char *pkg; - unsigned int badge_count; - - if (!callback) - return BADGE_ERROR_INVALID_PARAMETER; - - sqlret = db_util_open(BADGE_DB_PATH, &db, 0); - if (sqlret != SQLITE_OK || !db) { - ERR("fail to db_util_open - [%d]", sqlret); - return BADGE_ERROR_FROM_DB; - } - - sqlbuf = sqlite3_mprintf("SELECT pkgname, badge FROM %q WHERE uid = %d", - BADGE_TABLE_NAME, uid); - if (!sqlbuf) { - ERR("fail to alloc sql query"); - result = BADGE_ERROR_OUT_OF_MEMORY; - goto free_and_return; - } - - sqlret = sqlite3_prepare_v2(db, sqlbuf, -1, &stmt, NULL); - if (sqlret != SQLITE_OK) { - ERR("fail to sqlite3_prepare_v2 - [%s]", sqlite3_errmsg(db)); - ERR("query[%s]", sqlbuf); - result = BADGE_ERROR_FROM_DB; - goto free_and_return; - } - - sqlret = sqlite3_step(stmt); - if (sqlret == SQLITE_DONE) { - INFO("badge db has no data"); - result = BADGE_ERROR_NOT_EXIST; - goto free_and_return; - } else if (sqlret == SQLITE_ROW) { - pkg = (const char *)sqlite3_column_text(stmt, 0); - badge_count = (unsigned int)sqlite3_column_int(stmt, 1); - - if (pkg) - callback(pkg, badge_count, data); - else - ERR("db has invaild data"); - } else { - ERR("fail to sqlite3_step : %d", sqlret); - result = BADGE_ERROR_FROM_DB; - goto free_and_return; - } - - while (sqlite3_step(stmt) == SQLITE_ROW) { - pkg = (const char *)sqlite3_column_text(stmt, 0); - badge_count = (unsigned int)sqlite3_column_int(stmt, 1); - - if (pkg) - callback(pkg, badge_count, data); - else - ERR("db has invaild data"); - } - -free_and_return: - if (sqlbuf) - sqlite3_free(sqlbuf); - - if (stmt) - sqlite3_finalize(stmt); - - sqlret = db_util_close(db); - if (sqlret != SQLITE_OK) - WARN("fail to db_util_close - [%d]", sqlret); - - return result; -} -/* LCOV_EXCL_STOP */ - int _badge_insert(badge_h *badge, uid_t uid) { sqlite3 *db = NULL; @@ -1317,89 +1237,6 @@ char *_badge_pkgs_new(int *err, const char *pkg1, ...) return result; } -/* LCOV_EXCL_START */ -char *_badge_pkgs_new_valist(int *err, const char *pkg1, va_list args) -{ - char *caller_pkgname = NULL; - char *s = NULL; - char *result = NULL; - char *ptr = NULL; - gsize length; - va_list args2; - char *new_pkgs = NULL; - - if (err) - *err = BADGE_ERROR_NONE; - - caller_pkgname = _badge_get_pkgname_by_pid(); - if (!caller_pkgname) { - ERR("fail to get caller pkgname"); - if (err) - *err = BADGE_ERROR_PERMISSION_DENIED; - return NULL; - } - - if (!pkg1) { - WARN("pkg1 is NULL"); - return caller_pkgname; - } - - G_VA_COPY(args2, args); - - length = strlen(pkg1); - s = va_arg(args, char *); - while (s) { - length += strlen(s) ; - s = va_arg(args, char *); - } - - if (length <= 0) { - WARN("length is %d", length); - va_end(args2); - return caller_pkgname; - } - - result = g_new0(char, length + 1); /* 1 for null terminate */ - if (!result) { - ERR("fail to alloc memory"); - if (err) - *err = BADGE_ERROR_OUT_OF_MEMORY; - free(caller_pkgname); - va_end(args2); - return NULL; - } - - ptr = result; - ptr = g_stpcpy(ptr, pkg1); - s = va_arg(args2, char *); - while (s) { - ptr = g_stpcpy(ptr, s); - s = va_arg(args2, char *); - } - va_end(args2); - - 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"); - if (err) - *err = BADGE_ERROR_OUT_OF_MEMORY; - - free(result); - free(caller_pkgname); - return NULL; - } - free(result); - result = new_pkgs; - } - - free(caller_pkgname); - - return result; -} -/* LCOV_EXCL_STOP */ - - EXPORT_API int badge_create_for_uid(const char *pkgname, const char *writable_pkg, uid_t uid) { -- 2.7.4