diff options
| author | Allan McRae <allan@archlinux.org> | 2011-06-28 14:43:48 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-06-28 23:28:24 +1000 |
| commit | 011ef6be0e68dcf148a255c31a9a6efb7429c2f9 (patch) | |
| tree | 2eb832c6554c2f26c145599fcb4f9a70bf658315 | |
| parent | 590a8fcb1e72707d83d04f639385de0d7f2a60c1 (diff) | |
| download | pacman-011ef6be0e68dcf148a255c31a9a6efb7429c2f9.tar.xz | |
Rename pmtransevt_t to alpm_transevt_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 f922be3c..78a98b80 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -754,7 +754,7 @@ typedef enum _alpm_transflag_t { /** Transaction events. * NULL parameters are passed to in all events unless specified otherwise. */ -typedef enum _pmtransevt_t { +typedef enum _alpm_transevt_t { /** Dependencies will be computed for a package. */ PM_TRANS_EVT_CHECKDEPS_START = 1, /** Dependencies were computed for a package. */ @@ -829,7 +829,7 @@ typedef enum _pmtransevt_t { PM_TRANS_EVT_DISKSPACE_START, /** Disk space usage was computed for a package */ PM_TRANS_EVT_DISKSPACE_DONE, -} pmtransevt_t; +} alpm_transevt_t; /** Transaction Conversations (ie, questions) */ typedef enum _pmtransconv_t { @@ -853,7 +853,7 @@ typedef enum _pmtransprog_t { } pmtransprog_t; /** Transaction Event callback */ -typedef void (*alpm_trans_cb_event)(pmtransevt_t, void *, void *); +typedef void (*alpm_trans_cb_event)(alpm_transevt_t, void *, void *); /** Transaction Conversation callback */ typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *, diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 6b5546a6..a53b3fdd 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -153,7 +153,7 @@ static void fill_progress(const int bar_percent, const int disp_percent, /* callback to handle messages/notifications from libalpm transactions */ -void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) +void cb_trans_evt(alpm_transevt_t event, void *data1, void *data2) { switch(event) { case PM_TRANS_EVT_CHECKDEPS_START: diff --git a/src/pacman/callback.h b/src/pacman/callback.h index 5e8acd7a..ae78eb44 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -25,7 +25,7 @@ #include <alpm.h> /* callback to handle messages/notifications from libalpm transactions */ -void cb_trans_evt(pmtransevt_t event, void *data1, void *data2); +void cb_trans_evt(alpm_transevt_t event, void *data1, void *data2); /* callback to handle questions from libalpm transactions (yes/no) */ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, |