From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 20 Oct 2023 11:24:15 +0000 (+0000)
Subject: cli: client: Use the global config struct
X-Git-Tag: 0.9.30~1425
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e38be654a4aae72110551683cb2571cf0c78850;p=pakfire.git

cli: client: Use the global config struct

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

diff --git a/src/cli/lib/client-build.c b/src/cli/lib/client-build.c
index 914d74710..39c7dc68d 100644
--- a/src/cli/lib/client-build.c
+++ b/src/cli/lib/client-build.c
@@ -20,11 +20,11 @@
 
 #include <argp.h>
 
+#include <pakfire/buildservice.h>
+
 #include "client-build.h"
 #include "command.h"
-
-#include <pakfire/ctx.h>
-#include <pakfire/buildservice.h>
+#include "pakfire.h"
 
 static const char* args_doc = "[OPTIONS...] MAKEFILES...";
 
@@ -103,7 +103,7 @@ int cli_client_build(void* data, int argc, char* argv[]) {
 	char* upload = NULL;
 	int r;
 
-	struct pakfire_ctx* ctx = data;
+	struct cli_config* cli_config = data;
 
 	// Parse the command line
 	r = cli_parse(options, NULL, args_doc, doc, parse, argc, argv, &config);
@@ -111,7 +111,7 @@ int cli_client_build(void* data, int argc, char* argv[]) {
 		goto ERROR;
 
 	// Connect to the build service
-	r = pakfire_buildservice_create(&service, ctx);
+	r = pakfire_buildservice_create(&service, cli_config->ctx);
 	if (r)
 		goto ERROR;
 
diff --git a/src/cli/lib/upload_create.c b/src/cli/lib/upload_create.c
index e578df85c..78e7d2e2f 100644
--- a/src/cli/lib/upload_create.c
+++ b/src/cli/lib/upload_create.c
@@ -21,9 +21,9 @@
 #include <argp.h>
 
 #include <pakfire/buildservice.h>
-#include <pakfire/ctx.h>
 
 #include "command.h"
+#include "pakfire.h"
 #include "upload_create.h"
 
 static const char* args_doc = "FILES...";
@@ -61,7 +61,7 @@ int cli_upload_create(void* data, int argc, char* argv[]) {
 	char* uuid = NULL;
 	int r;
 
-	struct pakfire_ctx* ctx = data;
+	struct cli_config* cli_config = data;
 
 	// Parse the command line
 	r = cli_parse(NULL, NULL, args_doc, doc, parse, argc, argv, &config);
@@ -69,7 +69,7 @@ int cli_upload_create(void* data, int argc, char* argv[]) {
 		goto ERROR;
 
 	// Connect to the build service
-	r = pakfire_buildservice_create(&service, ctx);
+	r = pakfire_buildservice_create(&service, cli_config->ctx);
 	if (r)
 		goto ERROR;
 
diff --git a/src/cli/lib/upload_delete.c b/src/cli/lib/upload_delete.c
index e85477e5f..2b32335c5 100644
--- a/src/cli/lib/upload_delete.c
+++ b/src/cli/lib/upload_delete.c
@@ -21,10 +21,10 @@
 #include <argp.h>
 
 #include <pakfire/buildservice.h>
-#include <pakfire/ctx.h>
 #include <pakfire/util.h>
 
 #include "command.h"
+#include "pakfire.h"
 #include "upload_delete.h"
 
 static const char* args_doc = "FILES...";
@@ -65,7 +65,7 @@ int cli_upload_delete(void* data, int argc, char* argv[]) {
 	struct config config = {};
 	int r;
 
-	struct pakfire_ctx* ctx = data;
+	struct cli_config* cli_config = data;
 
 	// Parse the command line
 	r = cli_parse(NULL, NULL, args_doc, doc, parse, argc, argv, &config);
@@ -73,7 +73,7 @@ int cli_upload_delete(void* data, int argc, char* argv[]) {
 		goto ERROR;
 
 	// Connect to the build service
-	r = pakfire_buildservice_create(&service, ctx);
+	r = pakfire_buildservice_create(&service, cli_config->ctx);
 	if (r)
 		goto ERROR;
 
diff --git a/src/cli/lib/upload_list.c b/src/cli/lib/upload_list.c
index 46ad5ee29..3d3eb88b1 100644
--- a/src/cli/lib/upload_list.c
+++ b/src/cli/lib/upload_list.c
@@ -21,10 +21,10 @@
 #include <json.h>
 
 #include <pakfire/buildservice.h>
-#include <pakfire/ctx.h>
 
 #include "command.h"
 #include "dump.h"
+#include "pakfire.h"
 #include "upload_list.h"
 
 static const char* doc = "Lists all uploads";
@@ -34,7 +34,7 @@ int cli_upload_list(void* data, int argc, char* argv[]) {
 	struct json_object* uploads = NULL;
 	int r;
 
-	struct pakfire_ctx* ctx = data;
+	struct cli_config* cli_config = data;
 
 	// Parse the command line
 	r = cli_parse(NULL, NULL, NULL, doc, NULL, argc, argv, NULL);
@@ -42,7 +42,7 @@ int cli_upload_list(void* data, int argc, char* argv[]) {
 		goto ERROR;
 
 	// Connect to the build service
-	r = pakfire_buildservice_create(&service, ctx);
+	r = pakfire_buildservice_create(&service, cli_config->ctx);
 	if (r)
 		goto ERROR;
 
diff --git a/src/cli/pakfire-client.c b/src/cli/pakfire-client.c
index cfe91d473..9ce6b7632 100644
--- a/src/cli/pakfire-client.c
+++ b/src/cli/pakfire-client.c
@@ -25,6 +25,8 @@
 
 #include "lib/client-build.h"
 #include "lib/command.h"
+#include "lib/config.h"
+#include "lib/pakfire.h"
 #include "lib/progressbar.h"
 #include "lib/upload.h"
 
@@ -51,11 +53,11 @@ static struct argp_option options[] = {
 };
 
 static error_t parse(int key, char* arg, struct argp_state* state, void* data) {
-	struct pakfire_ctx* ctx = data;
+	struct cli_config* config = data;
 
 	switch (key) {
 		case OPT_DEBUG:
-			pakfire_ctx_set_log_level(ctx, LOG_DEBUG);
+			pakfire_ctx_set_log_level(config->ctx, LOG_DEBUG);
 			break;
 
 		default:
@@ -77,8 +79,12 @@ int main(int argc, char* argv[]) {
 	// Setup progress callback
 	pakfire_ctx_set_progress_callback(ctx, cli_setup_progressbar, NULL);
 
+	struct cli_config config = {
+		.ctx    = ctx,
+	};
+
 	// Parse the command line and run any commands
-	r = cli_parse(options, commands, args_doc, doc, parse, argc, argv, ctx);
+	r = cli_parse(options, commands, args_doc, doc, parse, argc, argv, &config);
 
 ERROR:
 	if (ctx)