buildservice: Remove the event loop

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

diff --git a/src/_pakfire/buildservice.c b/src/_pakfire/buildservice.c
index a6099f63863305bf5edaa1791eabbbbb65ebf528..7772df4601b59ead5ed4c46678aaa9001ff0dc97 100644 (file)
--- 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 32989feaef4a8696d422c0048c4229f3d16c2d1b..e76b72075fd17042eb94f92a6b54be49b847689a 100644 (file)
--- 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 cf6ac3773d29006df87429d3a51668f0375cfdea..f825f47bbadc51842cfe39298cb1b1f27113507f 100644 (file)
--- 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 76b2287f0df4d8efd965c09d6b170d47347bbc48..84a0ace4ce17d942cdaed1f11c096a2878c06094 100644 (file)
--- 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 3feba67e740804dcd241302deb51e9f5f3d07f9f..a00c2bb79a4021287909401bb1899ac051d26b2a 100644 (file)
--- 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 2cedcfefc3d441a9c2dd7ea7839d21480d5ce2ba..9bdc7c7943bbf8bbebd629c7a5e5ca82874e58b6 100644 (file)
--- 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 09f49be2fe9ec42f292cb5a7d7b3fc8b7bd4d804..e0d3b4498dc4b6d6e35658fa8a2496b9c87302df 100644 (file)
--- 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 daccab6f2719023979b97def2eb9c6dbd913a3d0..eeb09191f15956158895a8fe78870c27ff0da200 100644 (file)
--- 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 7dc49cb51fdc4c6f5e0eab22414d25e342a54a19..c8e5697e40092e6dbb638fa6292bcc9fc49f3967 100644 (file)
--- 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 e976060b62784087729485fd11014c1650944145..314d428d6e9825fd1b15e1fa394c458736da1541 100644 (file)
--- 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 fa05cf5e05caa7d1a05f133aaea2a97619039c0c..1f1ea40aa4af01448cbde8e46a0ea0d788b95116 100644 (file)
--- a/src/libpakfire/include/pakfire/buildservice.h
+++ b/src/libpakfire/include/pakfire/buildservice.h
@@ -25,12 +25,10 @@ struct pakfire_buildservice;
 
 #include <json.h>
 
-#include <systemd/sd-event.h>
-
 #include <pakfire/ctx.h>
 
 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);