From 78cbc045c129ca7767b13127e1e17c400b112770 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 3 Jun 2011 11:48:24 -0500 Subject: Remove ALPM_LOG_FUNC macro The usefulness of this is rather limited due to it not being compiled into production builds. When you do choose to see the output, it is often overwhelming and not helpful. The best bet is to use a debugger and/or well-placed fprintf() statements. Signed-off-by: Dan McGee --- lib/libalpm/be_local.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'lib/libalpm/be_local.c') diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 36105452..fc138e39 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -44,7 +44,6 @@ #define LAZY_LOAD(info, errret) \ do { \ - ALPM_LOG_FUNC; \ ASSERT(handle != NULL, return (errret)); \ if(pkg->origin != PKG_FROM_FILE && !(pkg->infolevel & info)) { \ _alpm_local_db_read(pkg->origin_data.db, pkg, info); \ @@ -138,8 +137,6 @@ static alpm_list_t *_cache_get_groups(pmpkg_t *pkg) static int _cache_has_scriptlet(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return -1); @@ -187,8 +184,6 @@ static alpm_list_t *_cache_get_deltas(pmpkg_t UNUSED *pkg) static alpm_list_t *_cache_get_files(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); @@ -201,8 +196,6 @@ static alpm_list_t *_cache_get_files(pmpkg_t *pkg) static alpm_list_t *_cache_get_backup(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); @@ -221,8 +214,6 @@ static alpm_list_t *_cache_get_backup(pmpkg_t *pkg) */ static void *_cache_changelog_open(pmpkg_t *pkg) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); @@ -346,8 +337,6 @@ static int local_db_populate(pmdb_t *db) const char *dbpath; DIR *dbdir; - ALPM_LOG_FUNC; - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); dbpath = _alpm_db_path(db); @@ -473,8 +462,6 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) char line[1024]; char *pkgpath = NULL; - ALPM_LOG_FUNC; - if(db == NULL) { RET_ERR(PM_ERR_DB_NULL, -1); } @@ -721,8 +708,6 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) int retval = 0; char *pkgpath = NULL; - ALPM_LOG_FUNC; - if(db == NULL || info == NULL) { return -1; } @@ -884,8 +869,6 @@ int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info) int ret = 0; char *pkgpath = NULL; - ALPM_LOG_FUNC; - if(db == NULL || info == NULL) { RET_ERR(PM_ERR_DB_NULL, -1); } @@ -962,8 +945,6 @@ pmdb_t *_alpm_db_register_local(void) { pmdb_t *db; - ALPM_LOG_FUNC; - _alpm_log(PM_LOG_DEBUG, "registering local database\n"); db = _alpm_db_new("local", 1); -- cgit v1.2.3-24-g4f1b