From 9a9e4dc5565ea0b4ed2ba5be13b08f2a975ac80f Mon Sep 17 00:00:00 2001 From: Jelle van der Waa <jelle@archlinux.org> Date: Fri, 4 Jun 2021 20:49:42 +0200 Subject: [PATCH] Update callback functions for pacman 6 --- src/handle.c | 6 +++--- src/transaction.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/handle.c b/src/handle.c index 211219a..3587e4d 100644 --- a/src/handle.c +++ b/src/handle.c @@ -163,10 +163,10 @@ struct _alpm_cb_getset { pyalpm_callback_id id; }; -void pyalpm_eventcb(alpm_event_t event, void* data1, void *data2); -void pyalpm_questioncb(alpm_question_t question, +void pyalpm_eventcb(void *ctx, alpm_event_t event, void* data1, void *data2); +void pyalpm_questioncb(void *ctx, alpm_question_t question, void* data1, void *data2, void* data3, int* retcode); -void pyalpm_progresscb(alpm_progress_t op, +void pyalpm_progresscb(void *ctx, alpm_progress_t op, const char* target_name, int percentage, size_t n_targets, size_t cur_target); static struct _alpm_cb_getset cb_getsets[N_CALLBACKS] = { diff --git a/src/transaction.c b/src/transaction.c index eaadaa6..073be4f 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -31,7 +31,7 @@ /** Transaction callbacks */ extern PyObject *global_py_callbacks[N_CALLBACKS]; -void pyalpm_eventcb(alpm_event_t *event) { +void pyalpm_eventcb(void *ctx, alpm_event_t *event) { const char *eventstr; switch(event->type) { case ALPM_EVENT_CHECKDEPS_START: @@ -153,11 +153,11 @@ void pyalpm_eventcb(alpm_event_t *event) { } } -void pyalpm_questioncb(alpm_question_t question, +void pyalpm_questioncb(void *ctx, alpm_question_t question, void* data1, void *data2, void* data3, int* retcode) { } -void pyalpm_progresscb(alpm_progress_t op, +void pyalpm_progresscb(void *ctx, alpm_progress_t op, const char* target_name, int percentage, size_t n_targets, size_t cur_target) { PyObject *result = NULL; if (global_py_callbacks[CB_PROGRESS]) { -- GitLab