From 98fdfa1968f81596acd25ed5b77cc968dcd97ead Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 1 Sep 2011 17:35:50 -0500 Subject: 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 --- lib/libalpm/handle.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/libalpm/handle.h') 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 */ -- cgit v1.2.3-24-g4f1b