From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 24 Jun 2025 16:14:03 +0000 (+0000)
Subject: client: Move the callback into the auth struct
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e84022bbbf835157a27f1028a85a3deb2d0125e;p=pakfire.git

client: Move the callback into the auth struct

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

diff --git a/src/pakfire/client.c b/src/pakfire/client.c
index 966e12bb..cab75d7d 100644
--- a/src/pakfire/client.c
+++ b/src/pakfire/client.c
@@ -64,13 +64,11 @@ struct pakfire_client {
 
 		// Timer
 		sd_event_source* timer;
-	} auth;
 
-	// Callbacks
-	struct pakfire_client_auth_callback {
+		// Callback
 		pakfire_client_auth_callback callback;
 		void* data;
-	} auth_callback;
+	} auth;
 };
 
 static int pakfire_client_xfer_create(struct pakfire_xfer** xfer,
@@ -287,8 +285,8 @@ int pakfire_client_run(struct pakfire_client* self) {
 
 int pakfire_client_set_auth_callback(struct pakfire_client* self,
 		pakfire_client_auth_callback callback, void* data) {
-	self->auth_callback.callback = callback;
-	self->auth_callback.data     = data;
+	self->auth.callback = callback;
+	self->auth.data     = data;
 
 	return 0;
 }
@@ -345,9 +343,9 @@ static int pakfire_client_auth_successful(
 		return r;
 
 	// Call the authentication callback
-	if (self->auth_callback.callback) {
-		r = self->auth_callback.callback(self,
-				PAKFIRE_CLIENT_AUTH_SUCCESSFUL, self->auth_callback.data);
+	if (self->auth.callback) {
+		r = self->auth.callback(self,
+				PAKFIRE_CLIENT_AUTH_SUCCESSFUL, self->auth.data);
 		if (r < 0)
 			return r;
 	}
@@ -362,9 +360,9 @@ static int pakfire_client_auth_failed(struct pakfire_client* self) {
 	int r;
 
 	// Call the authentication callback
-	if (self->auth_callback.callback) {
-		r = self->auth_callback.callback(self,
-				PAKFIRE_CLIENT_AUTH_SUCCESSFUL, self->auth_callback.data);
+	if (self->auth.callback) {
+		r = self->auth.callback(self,
+				PAKFIRE_CLIENT_AUTH_SUCCESSFUL, self->auth.data);
 		if (r < 0)
 			return r;
 	}