From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 22 Mar 2025 16:29:34 +0000 (+0000)
Subject: log stream: Move data as second argument of the callback
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a73d391e78f26727b0f7d28fac05bfdeb444f2b;p=pakfire.git

log stream: Move data as second argument of the callback

That way, we are compatible with the PTY stdout callback.

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

diff --git a/src/pakfire/jail.c b/src/pakfire/jail.c
index 71d317dd..d004c79c 100644
--- a/src/pakfire/jail.c
+++ b/src/pakfire/jail.c
@@ -353,21 +353,21 @@ static void pakfire_jail_log_redirect(void* data, int priority, const char* file
 /*
 	Passes any log messages on to the context logger
 */
-static int pakfire_jail_INFO(struct pakfire_ctx* ctx, const char* line, size_t length, void* data) {
+static int pakfire_jail_INFO(struct pakfire_ctx* ctx, void* data, const char* line, size_t length) {
 	struct pakfire_jail* jail = data;
 
 	INFO(jail->ctx, "%.*s", (int)length, line);
 	return 0;
 }
 
-static int pakfire_jail_WARN(struct pakfire_ctx* ctx, const char* line, size_t length, void* data) {
+static int pakfire_jail_WARN(struct pakfire_ctx* ctx, void* data, const char* line, size_t length) {
 	struct pakfire_jail* jail = data;
 
 	ERROR(jail->ctx, "%.*s", (int)length, line);
 	return 0;
 }
 
-static int pakfire_jail_ERROR(struct pakfire_ctx* ctx, const char* line, size_t length, void* data) {
+static int pakfire_jail_ERROR(struct pakfire_ctx* ctx, void* data, const char* line, size_t length) {
 	struct pakfire_jail* jail = data;
 
 	ERROR(jail->ctx, "%.*s", (int)length, line);
@@ -375,7 +375,7 @@ static int pakfire_jail_ERROR(struct pakfire_ctx* ctx, const char* line, size_t
 }
 
 #ifdef ENABLE_DEBUG
-static int pakfire_jail_DEBUG(struct pakfire_ctx* ctx, const char* line, size_t length, void* data) {
+static int pakfire_jail_DEBUG(struct pakfire_ctx* ctx, void* data, const char* line, size_t length) {
 	struct pakfire_jail* jail = data;
 
 	DEBUG(jail->ctx, "%.*s", (int)length, line);
diff --git a/src/pakfire/job.c b/src/pakfire/job.c
index 8d6cd15e..d9764e5d 100644
--- a/src/pakfire/job.c
+++ b/src/pakfire/job.c
@@ -526,7 +526,7 @@ static int pakfire_job_send_log(struct pakfire_job* job, int priority, const cha
 }
 
 static int pakfire_job_stdout(struct pakfire_ctx* ctx,
-		const char* line, size_t length, void* data) {
+		void* data, const char* line, size_t length) {
 	struct pakfire_job* job = data;
 
 	// Send the output to the build service
@@ -534,7 +534,7 @@ static int pakfire_job_stdout(struct pakfire_ctx* ctx,
 }
 
 static int pakfire_job_stderr(struct pakfire_ctx* ctx,
-		const char* line, size_t length, void* data) {
+		void* data, const char* line, size_t length) {
 	struct pakfire_job* job = data;
 
 	// Send the output to the build service
diff --git a/src/pakfire/log_stream.c b/src/pakfire/log_stream.c
index 75c60ef8..2cf36832 100644
--- a/src/pakfire/log_stream.c
+++ b/src/pakfire/log_stream.c
@@ -279,7 +279,7 @@ static int pakfire_log_stream_drain_buffer(struct pakfire_log_stream* stream) {
 			return r;
 
 		// Call the callback
-		r = stream->callback(stream->ctx, line, r, stream->data);
+		r = stream->callback(stream->ctx, stream->data, line, r);
 		if (r)
 			return r;
 
diff --git a/src/pakfire/log_stream.h b/src/pakfire/log_stream.h
index 8328edb7..91b4ce21 100644
--- a/src/pakfire/log_stream.h
+++ b/src/pakfire/log_stream.h
@@ -30,7 +30,7 @@
 struct pakfire_log_stream;
 
 typedef int (*pakfire_log_stream_callback)(struct pakfire_ctx* ctx,
-	const char* line, size_t length, void* data);
+	void* data, const char* line, size_t length);
 
 int pakfire_log_stream_create(struct pakfire_log_stream** stream, struct pakfire_ctx* ctx,
 	pakfire_log_stream_callback callback, void* data);
diff --git a/tests/libpakfire/log_stream.c b/tests/libpakfire/log_stream.c
index bd75bf53..e19eae3f 100644
--- a/tests/libpakfire/log_stream.c
+++ b/tests/libpakfire/log_stream.c
@@ -24,7 +24,7 @@
 #include "../testsuite.h"
 
 static int log_callback(struct pakfire_ctx* ctx,
-		const char* line, size_t length, void* data) {
+		void* data, const char* line, size_t length) {
 	int* lines_read = data;
 
 	// Increment the counter