diff options
| author | Allan McRae <allan@archlinux.org> | 2011-06-28 14:48:50 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-06-28 23:28:24 +1000 |
| commit | 1059df7486054c621423436b801681775a2596c3 (patch) | |
| tree | 61669ed8582993c33e5ce108202bed20fb5c2cd2 | |
| parent | 565e167356c1ec56803454b2b4c617f21296fb67 (diff) | |
| download | pacman-1059df7486054c621423436b801681775a2596c3.tar.xz | |
Rename pmtransprog_t to alpm_transprog_t
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/alpm.h | 6 | ||||
| -rw-r--r-- | src/pacman/callback.c | 2 | ||||
| -rw-r--r-- | src/pacman/callback.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 22fe387d..cf040807 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -843,14 +843,14 @@ typedef enum _alpm_transconv_t { } alpm_transconv_t; /** Transaction Progress */ -typedef enum _pmtransprog_t { +typedef enum _alpm_transprog_t { PM_TRANS_PROGRESS_ADD_START, PM_TRANS_PROGRESS_UPGRADE_START, PM_TRANS_PROGRESS_REMOVE_START, PM_TRANS_PROGRESS_CONFLICTS_START, PM_TRANS_PROGRESS_DISKSPACE_START, PM_TRANS_PROGRESS_INTEGRITY_START, -} pmtransprog_t; +} alpm_transprog_t; /** Transaction Event callback */ typedef void (*alpm_trans_cb_event)(alpm_transevt_t, void *, void *); @@ -860,7 +860,7 @@ typedef void (*alpm_trans_cb_conv)(alpm_transconv_t, void *, void *, void *, int *); /** Transaction Progress callback */ -typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, size_t); +typedef void (*alpm_trans_cb_progress)(alpm_transprog_t, const char *, int, size_t, size_t); /** Returns the bitfield of flags for the current transaction. * @param handle the context handle diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c59c566f..f579e7ae 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -343,7 +343,7 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2, } /* callback to handle display of transaction progress */ -void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, +void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent, size_t howmany, size_t current) { /* size of line to allocate for text printing (e.g. not progressbar) */ diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 388af39d..30b5a71a 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -32,7 +32,7 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2, void *data3, int *response); /* callback to handle display of transaction progress */ -void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, +void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent, size_t howmany, size_t remain); /* callback to handle receipt of total download value */ |