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/conflict.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'lib/libalpm/conflict.c') diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index fbc988bd..995c6cb7 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -45,8 +45,6 @@ pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, { pmconflict_t *conflict; - ALPM_LOG_FUNC; - MALLOC(conflict, sizeof(pmconflict_t), RET_ERR(PM_ERR_MEMORY, NULL)); STRDUP(conflict->package1, package1, RET_ERR(PM_ERR_MEMORY, NULL)); @@ -82,8 +80,6 @@ static int conflict_isin(pmconflict_t *needle, alpm_list_t *haystack) const char *npkg1 = needle->package1; const char *npkg2 = needle->package2; - ALPM_LOG_FUNC; - for(i = haystack; i; i = i->next) { pmconflict_t *conflict = i->data; const char *cpkg1 = conflict->package1; @@ -168,8 +164,6 @@ alpm_list_t *_alpm_innerconflicts(alpm_list_t *packages) { alpm_list_t *baddeps = NULL; - ALPM_LOG_FUNC; - _alpm_log(PM_LOG_DEBUG, "check targets vs targets\n"); check_conflict(packages, packages, &baddeps, 0); @@ -184,8 +178,6 @@ alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages) { alpm_list_t *baddeps = NULL; - ALPM_LOG_FUNC; - if(db == NULL) { return NULL; } @@ -359,8 +351,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, size_t numtargs = alpm_list_count(upgrade); size_t current; - ALPM_LOG_FUNC; - if(db == NULL || upgrade == NULL || trans == NULL) { return NULL; } @@ -517,8 +507,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -528,8 +516,6 @@ const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -539,8 +525,6 @@ const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -550,8 +534,6 @@ const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -561,8 +543,6 @@ const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict) pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return -1); ASSERT(conflict != NULL, return -1); @@ -572,8 +552,6 @@ pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conf const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); @@ -583,8 +561,6 @@ const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict) { - ALPM_LOG_FUNC; - /* Sanity checks */ ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); -- cgit v1.2.3-54-g00ecf