diff options
| author | Allan McRae <allan@archlinux.org> | 2011-06-28 14:46:58 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2011-06-28 23:28:24 +1000 |
| commit | 565e167356c1ec56803454b2b4c617f21296fb67 (patch) | |
| tree | 3f4cbc9825606ac015469be3967b0d5037bab553 | |
| parent | 011ef6be0e68dcf148a255c31a9a6efb7429c2f9 (diff) | |
| download | pacman-565e167356c1ec56803454b2b4c617f21296fb67.tar.xz | |
Rename pmtransconv_t to alpm_transconv_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 78a98b80..22fe387d 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -832,7 +832,7 @@ typedef enum _alpm_transevt_t { } alpm_transevt_t; /** Transaction Conversations (ie, questions) */ -typedef enum _pmtransconv_t { +typedef enum _alpm_transconv_t { PM_TRANS_CONV_INSTALL_IGNOREPKG = 1, PM_TRANS_CONV_REPLACE_PKG = (1 << 1), PM_TRANS_CONV_CONFLICT_PKG = (1 << 2), @@ -840,7 +840,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_LOCAL_NEWER = (1 << 4), PM_TRANS_CONV_REMOVE_PKGS = (1 << 5), PM_TRANS_CONV_SELECT_PROVIDER = (1 << 6), -} pmtransconv_t; +} alpm_transconv_t; /** Transaction Progress */ typedef enum _pmtransprog_t { @@ -856,7 +856,7 @@ typedef enum _pmtransprog_t { typedef void (*alpm_trans_cb_event)(alpm_transevt_t, void *, void *); /** Transaction Conversation callback */ -typedef void (*alpm_trans_cb_conv)(pmtransconv_t, void *, void *, +typedef void (*alpm_trans_cb_conv)(alpm_transconv_t, void *, void *, void *, int *); /** Transaction Progress callback */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index a53b3fdd..c59c566f 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -251,7 +251,7 @@ void cb_trans_evt(alpm_transevt_t event, void *data1, void *data2) /* callback to handle questions from libalpm transactions (yes/no) */ /* TODO this is one of the worst ever functions written. void *data ? wtf */ -void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, +void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2, void *data3, int *response) { switch(event) { diff --git a/src/pacman/callback.h b/src/pacman/callback.h index ae78eb44..388af39d 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -28,7 +28,7 @@ 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, +void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2, void *data3, int *response); /* callback to handle display of transaction progress */ |