From 37da18aee8d925ee5cd9f526f2c61d07e9db5b66 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 1 Sep 2011 17:16:56 -0500 Subject: Move all callbacks up to the handle level This was just disgusting before, unnecessary to limit these to only usage in a transaction. Still a lot of more room for cleanup but we'll start by attaching them to the handle rather than the transaction we may or may not even want to use these callbacks. Signed-off-by: Dan McGee --- lib/libalpm/conflict.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/libalpm/conflict.c') diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 8417348a..4f96ad9a 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -384,7 +384,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_t *i, *conflicts = NULL; size_t numtargs = alpm_list_count(upgrade); size_t current; - alpm_trans_t *trans = handle->trans; if(!upgrade) { return NULL; @@ -402,7 +401,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, size_t filenum; int percent = (current * 100) / numtargs; - PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", percent, + PROGRESS(handle, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", percent, numtargs, current); /* CHECK 1: check every target against every target */ _alpm_log(handle, ALPM_LOG_DEBUG, "searching for file conflicts: %s\n", @@ -585,7 +584,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, free(tmpfiles.files); } } - PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", 100, + PROGRESS(handle, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", 100, numtargs, current); return conflicts; -- cgit v1.2.3-2-g168b