From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 17 Oct 2023 09:11:30 +0000 (+0000)
Subject: progressbar: Fix argument order
X-Git-Tag: 0.9.30~1471
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=939f8e70e05ac3a51dae094ca12b942f4c757521;p=pakfire.git

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 af81b09e1..76b5cc722 100644
--- 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 d8d782a0a..ff7aa493f 100644
--- 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 a4755db84..92a5acc87 100644
--- 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);