From 9540dfc4d9cc70266a425cc334f78d7805b2340b Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 28 Jun 2011 14:29:55 +1000 Subject: Rename pmdepend_t to alpm_depend_t Signed-off-by: Allan McRae --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pacman/callback.c') diff --git a/src/pacman/callback.c b/src/pacman/callback.c index ffca8bec..0cc462d6 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -312,7 +312,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, { alpm_list_t *providers = (alpm_list_t *)data1; int count = alpm_list_count(providers); - char *depstring = alpm_dep_compute_string((pmdepend_t *)data2); + char *depstring = alpm_dep_compute_string((alpm_depend_t *)data2); printf(_(":: There are %d providers available for %s:\n"), count, depstring); free(depstring); -- cgit v1.2.3 From 0aef91bc4fc5e872afe7da1692bf97c027eecf37 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 28 Jun 2011 14:41:07 +1000 Subject: Rename pmloglevel_t to alpm_loglevel_t Signed-off-by: Allan McRae --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pacman/callback.c') diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 0cc462d6..6b5546a6 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -655,7 +655,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } /* Callback to handle notifications from the library */ -void cb_log(pmloglevel_t level, const char *fmt, va_list args) +void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) { if(!fmt || strlen(fmt) == 0) { return; -- cgit v1.2.3 From 011ef6be0e68dcf148a255c31a9a6efb7429c2f9 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 28 Jun 2011 14:43:48 +1000 Subject: Rename pmtransevt_t to alpm_transevt_t Signed-off-by: Allan McRae --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pacman/callback.c') 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: -- cgit v1.2.3 From 565e167356c1ec56803454b2b4c617f21296fb67 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 28 Jun 2011 14:46:58 +1000 Subject: Rename pmtransconv_t to alpm_transconv_t Signed-off-by: Allan McRae --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pacman/callback.c') 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) { -- cgit v1.2.3 From 1059df7486054c621423436b801681775a2596c3 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Tue, 28 Jun 2011 14:48:50 +1000 Subject: Rename pmtransprog_t to alpm_transprog_t Signed-off-by: Allan McRae --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pacman/callback.c') diff --git a/src/pacman/callback.c b/src/pacman/callback.c index c59c566f..f579e7ae 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -343,7 +343,7 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2, } /* callback to handle display of transaction progress */ -void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, +void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent, size_t howmany, size_t current) { /* size of line to allocate for text printing (e.g. not progressbar) */ -- cgit v1.2.3