diff options
| author | Allan McRae <allan@archlinux.org> | 2011-07-02 02:01:39 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-07-02 02:01:39 +1000 |
| commit | bd88a8d5511c24db55dd2a5c04161918571dbfbd (patch) | |
| tree | aadcae00adb125de60cbaff68c8b44f8c7fb04c1 /lib/libalpm/conflict.c | |
| parent | 495ba26e63ec5cb6b8def29f4e22ea7c444348d8 (diff) | |
| download | pacman-bd88a8d5511c24db55dd2a5c04161918571dbfbd.tar.xz | |
Prefix alpm_transprog_t members with ALPM
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 7324e34e..af1bce15 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -389,7 +389,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, } int percent = (current * 100) / numtargs; - PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", percent, + PROGRESS(trans, 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", @@ -550,7 +550,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, FREELIST(tmpfiles); } } - PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", 100, + PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", 100, numtargs, current); return conflicts; |