moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename pmtransconv_t to alpm_transconv_t 

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2011-06-28 14:46:58 +10:00
parent 011ef6be0e
commit 565e167356
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libalpm/alpm.h
View File

@ -832,7 +832,7 @@ typedef enum _alpm_transevt_t {
} alpm_transevt_t; } alpm_transevt_t;
/** Transaction Conversations (ie, questions) */ /** Transaction Conversations (ie, questions) */
typedef enum _pmtransconv_t { typedef enum _alpm_transconv_t {
PM_TRANS_CONV_INSTALL_IGNOREPKG = 1, PM_TRANS_CONV_INSTALL_IGNOREPKG = 1,
PM_TRANS_CONV_REPLACE_PKG = (1 << 1), PM_TRANS_CONV_REPLACE_PKG = (1 << 1),
PM_TRANS_CONV_CONFLICT_PKG = (1 << 2), 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_LOCAL_NEWER = (1 << 4),
PM_TRANS_CONV_REMOVE_PKGS = (1 << 5), PM_TRANS_CONV_REMOVE_PKGS = (1 << 5),
PM_TRANS_CONV_SELECT_PROVIDER = (1 << 6), PM_TRANS_CONV_SELECT_PROVIDER = (1 << 6),
} pmtransconv_t; } alpm_transconv_t;
/** Transaction Progress */ /** Transaction Progress */
typedef enum _pmtransprog_t { typedef enum _pmtransprog_t {
@ -856,7 +856,7 @@ typedef enum _pmtransprog_t {
typedef void (*alpm_trans_cb_event)(alpm_transevt_t, void *, void *); typedef void (*alpm_trans_cb_event)(alpm_transevt_t, void *, void *);
/** Transaction Conversation callback */ /** 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 *); void *, int *);
/** Transaction Progress callback */ /** Transaction Progress callback */

2
src/pacman/callback.c
View File

@ -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) */ /* callback to handle questions from libalpm transactions (yes/no) */
/* TODO this is one of the worst ever functions written. void *data ? wtf */ /* 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) void *data3, int *response)
{ {
switch(event) { switch(event) {

2
src/pacman/callback.h
View File

@ -28,7 +28,7 @@
void cb_trans_evt(alpm_transevt_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) */ /* 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); void *data3, int *response);
/* callback to handle display of transaction progress */ /* callback to handle display of transaction progress */