progressbar: Fix argument order

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/cli/lib/progressbar.c b/src/cli/lib/progressbar.c
index af81b09e1c702e8b09db8c21edee508f6a3737d2..76b5cc72267cd988f707f4be7de4741a148ead9d 100644 (file)
--- a/src/cli/lib/progressbar.c
+++ b/src/cli/lib/progressbar.c
@@ -562,7 +562,7 @@ static int cli_progressbar_add_transfer_speed(struct cli_progressbar* p) {
        return cli_progressbar_add_widget(p, cli_progressbar_transfer_speed, NULL, 0, NULL);
 }
 
-int cli_setup_progressbar(struct pakfire_ctx* ctx, struct pakfire_progress* p, void* data) {
+int cli_setup_progressbar(struct pakfire_ctx* ctx, void* data, struct pakfire_progress* p) {
        struct cli_progressbar* progressbar = NULL;
        int r;
 

diff --git a/src/cli/lib/progressbar.h b/src/cli/lib/progressbar.h
index d8d782a0a3c12d14b17fa042e068eb0a4447ec9d..ff7aa493ff7c2b93fdf7a2b4cf8fa90d47f15d22 100644 (file)
--- a/src/cli/lib/progressbar.h
+++ b/src/cli/lib/progressbar.h
@@ -24,6 +24,6 @@
 #include <pakfire/ctx.h>
 #include <pakfire/progress.h>
 
-int cli_setup_progressbar(struct pakfire_ctx* ctx, struct pakfire_progress* p, void* data);
+int cli_setup_progressbar(struct pakfire_ctx* ctx, void* data, struct pakfire_progress* p);
 
 #endif /* PAKFIRE_CLI_PROGRESSBAR_H */

diff --git a/src/libpakfire/include/pakfire/ctx.h b/src/libpakfire/include/pakfire/ctx.h
index a4755db84edda89f10833ad10129fd7e55878ed4..92a5acc876cd1b84c09f52f636e8b85250126add 100644 (file)
--- a/src/libpakfire/include/pakfire/ctx.h
+++ b/src/libpakfire/include/pakfire/ctx.h
@@ -66,7 +66,7 @@ void pakfire_ctx_set_confirm_callback(struct pakfire_ctx* ctx,
 // Progress
 
 typedef int (*pakfire_progress_callback)(struct pakfire_ctx* ctx,
-       struct pakfire_progress* progress, void* data);
+       void* data, struct pakfire_progress* progress);
 
 void pakfire_ctx_set_progress_callback(struct pakfire_ctx* ctx,
        pakfire_progress_callback callback, void* data);