Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm/handle.h
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-09-01 17:35:50 -0500
committerDan McGee <dan@archlinux.org>2011-09-02 21:45:08 -0500
commit98fdfa1968f81596acd25ed5b77cc968dcd97ead (patch)
treea04926263ccf75be1188a4924ed512009023bd89 /lib/libalpm/handle.h
parent37da18aee8d925ee5cd9f526f2c61d07e9db5b66 (diff)
Former transaction callback rename refactor
Put all the callback stuff in alpm.h in one spot, and make the following renames for clarity with the new structure: ALPM_TRANS_EVT_* --> ALPM_EVENT_* ALPM_TRANS_CONV_* --> ALPM_QUESTION_* ALPM_TRANS_PROGRESS_* --> ALPM_PROGRESS_* alpm_option_get_convcb() --> alpm_option_get_questioncb() alpm_option_set_convcb() --> alpm_option_set_questioncb() Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/handle.h')
-rw-r--r--lib/libalpm/handle.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h
index 8ceecd32..b1d70d2d 100644
--- a/lib/libalpm/handle.h
+++ b/lib/libalpm/handle.h
@@ -38,8 +38,8 @@ do { \
} while(0)
#define QUESTION(h, q, d1, d2, d3, r) \
do { \
- if((h)->convcb) { \
- (h)->convcb(q, d1, d2, d3, r); \
+ if((h)->questioncb) { \
+ (h)->questioncb(q, d1, d2, d3, r); \
} \
} while(0)
#define PROGRESS(h, e, p, per, n, r) \
@@ -69,7 +69,7 @@ struct __alpm_handle_t {
alpm_cb_totaldl totaldlcb; /* Total download callback function */
alpm_cb_fetch fetchcb; /* Download file callback function */
alpm_cb_event eventcb;
- alpm_cb_conv convcb;
+ alpm_cb_question questioncb;
alpm_cb_progress progresscb;
/* filesystem paths */