From 4abd710ec993bf5766fdbf2f1cf240a8d6e7d17f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 1 Jan 2008 19:57:02 -0600 Subject: [PATCH] Remove gettext calls from debug-level messages These used FUNCTION output level and not DEBUG, so I didn't catch them way back when I removed those gettext calls. Remove them now (which exposed a nice little memory access error elsewhere in the code). This should have a slight speedup effect on the code too as we no longer have to make the gettext call even when these messages aren't printed. Signed-off-by: Dan McGee --- lib/libalpm/be_files.c | 3 ++- lib/libalpm/cache.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index 7df0b8b6..724e3c8f 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -270,7 +270,8 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) /* already loaded this info, do nothing */ return(0); } - _alpm_log(PM_LOG_FUNCTION, _("loading package data for %s : level=%d\n"), info->name, inforeq); + _alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n", + info->name, inforeq); /* clear out 'line', to be certain - and to make valgrind happy */ memset(line, 0, 513); diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index f966bb2b..0ad923a5 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -57,7 +57,7 @@ int _alpm_db_load_pkgcache(pmdb_t *db) _alpm_db_rewind(db); while((info = _alpm_db_scan(db, NULL)) != NULL) { - _alpm_log(PM_LOG_FUNCTION, _("adding '%s' to package cache for db '%s'\n"), + _alpm_log(PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n", alpm_pkg_get_name(info), db->treename); info->origin = PKG_FROM_CACHE; info->origin_data.db = db;