From: Michael Tremer Date: Sun, 15 Sep 2024 03:20:47 +0000 (+0000) Subject: buildservice: Remove the event loop X-Git-Tag: 0.9.30~1195 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=564c8af05d95d6cf6302ee1f60fc21ef5186de4e;p=pakfire.git buildservice: Remove the event loop Signed-off-by: Michael Tremer --- diff --git a/src/_pakfire/buildservice.c b/src/_pakfire/buildservice.c index a6099f638..7772df460 100644 --- a/src/_pakfire/buildservice.c +++ b/src/_pakfire/buildservice.c @@ -41,7 +41,7 @@ static int BuildService_init(BuildServiceObject* self, PyObject* args, PyObject* if (!PyArg_ParseTuple(args, "O!", &CtxType, &ctx)) return -1; - r = pakfire_buildservice_create(&self->service, ctx->ctx, NULL); + r = pakfire_buildservice_create(&self->service, ctx->ctx); if (r) { errno = -r; diff --git a/src/cli/lib/client-build.c b/src/cli/lib/client-build.c index 32989feae..e76b72075 100644 --- a/src/cli/lib/client-build.c +++ b/src/cli/lib/client-build.c @@ -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, cli_config->ctx, NULL); + r = pakfire_buildservice_create(&service, cli_config->ctx); if (r) goto ERROR; diff --git a/src/cli/lib/repo_create.c b/src/cli/lib/repo_create.c index cf6ac3773..f825f47bb 100644 --- a/src/cli/lib/repo_create.c +++ b/src/cli/lib/repo_create.c @@ -87,7 +87,7 @@ int cli_repo_create(void* data, int argc, char* argv[]) { goto ERROR; // Connect to the build service - r = pakfire_buildservice_create(&service, cli_config->ctx, NULL); + r = pakfire_buildservice_create(&service, cli_config->ctx); if (r) goto ERROR; diff --git a/src/cli/lib/repo_delete.c b/src/cli/lib/repo_delete.c index 76b2287f0..84a0ace4c 100644 --- a/src/cli/lib/repo_delete.c +++ b/src/cli/lib/repo_delete.c @@ -74,7 +74,7 @@ int cli_repo_delete(void* data, int argc, char* argv[]) { goto ERROR; // Connect to the build service - r = pakfire_buildservice_create(&service, cli_config->ctx, NULL); + r = pakfire_buildservice_create(&service, cli_config->ctx); if (r) goto ERROR; diff --git a/src/cli/lib/repo_list.c b/src/cli/lib/repo_list.c index 3feba67e7..a00c2bb79 100644 --- a/src/cli/lib/repo_list.c +++ b/src/cli/lib/repo_list.c @@ -66,7 +66,7 @@ int cli_repo_list(void* data, int argc, char* argv[]) { goto ERROR; // Connect to the build service - r = pakfire_buildservice_create(&service, cli_config->ctx, NULL); + r = pakfire_buildservice_create(&service, cli_config->ctx); if (r) goto ERROR; diff --git a/src/cli/lib/repo_show.c b/src/cli/lib/repo_show.c index 2cedcfefc..9bdc7c794 100644 --- a/src/cli/lib/repo_show.c +++ b/src/cli/lib/repo_show.c @@ -72,7 +72,7 @@ int cli_repo_show(void* data, int argc, char* argv[]) { goto ERROR; // Connect to the build service - r = pakfire_buildservice_create(&service, cli_config->ctx, NULL); + 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 09f49be2f..e0d3b4498 100644 --- a/src/cli/lib/upload_create.c +++ b/src/cli/lib/upload_create.c @@ -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, cli_config->ctx, NULL); + 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 daccab6f2..eeb09191f 100644 --- a/src/cli/lib/upload_delete.c +++ b/src/cli/lib/upload_delete.c @@ -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, cli_config->ctx, NULL); + 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 7dc49cb51..c8e5697e4 100644 --- a/src/cli/lib/upload_list.c +++ b/src/cli/lib/upload_list.c @@ -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, cli_config->ctx, NULL); + r = pakfire_buildservice_create(&service, cli_config->ctx); if (r) goto ERROR; diff --git a/src/libpakfire/buildservice.c b/src/libpakfire/buildservice.c index e976060b6..314d428d6 100644 --- a/src/libpakfire/buildservice.c +++ b/src/libpakfire/buildservice.c @@ -75,7 +75,7 @@ ERROR: return r; } -static int pakfire_buildservice_setup(struct pakfire_buildservice* service, sd_event* loop) { +static int pakfire_buildservice_setup(struct pakfire_buildservice* service) { struct pakfire_config* config = NULL; const char* url = NULL; const char* keytab = NULL; @@ -97,7 +97,7 @@ static int pakfire_buildservice_setup(struct pakfire_buildservice* service, sd_e } // Setup the HTTP client - r = pakfire_httpclient_create(&service->httpclient, service->ctx, loop); + r = pakfire_httpclient_create(&service->httpclient, service->ctx, NULL); if (r) goto ERROR; @@ -138,7 +138,7 @@ static void pakfire_buildservice_free(struct pakfire_buildservice* service) { } PAKFIRE_EXPORT int pakfire_buildservice_create( - struct pakfire_buildservice** service, struct pakfire_ctx* ctx, sd_event* loop) { + struct pakfire_buildservice** service, struct pakfire_ctx* ctx) { struct pakfire_buildservice* s = NULL; int r; @@ -154,7 +154,7 @@ PAKFIRE_EXPORT int pakfire_buildservice_create( s->nrefs = 1; // Setup everything - r = pakfire_buildservice_setup(s, loop); + r = pakfire_buildservice_setup(s); if (r) goto ERROR; diff --git a/src/libpakfire/include/pakfire/buildservice.h b/src/libpakfire/include/pakfire/buildservice.h index fa05cf5e0..1f1ea40aa 100644 --- a/src/libpakfire/include/pakfire/buildservice.h +++ b/src/libpakfire/include/pakfire/buildservice.h @@ -25,12 +25,10 @@ struct pakfire_buildservice; #include -#include - #include int pakfire_buildservice_create(struct pakfire_buildservice** service, - struct pakfire_ctx* ctx, sd_event* loop); + struct pakfire_ctx* ctx); struct pakfire_buildservice* pakfire_buildservice_ref(struct pakfire_buildservice* service); struct pakfire_buildservice* pakfire_buildservice_unref(struct pakfire_buildservice* service);