From: Michael Tremer Date: Wed, 25 Jun 2025 15:54:38 +0000 (+0000) Subject: job: Use the context's event loop X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4840fa89db4d3f80affc9f7c12aaf72b4026f5d6;p=pakfire.git job: Use the context's event loop Signed-off-by: Michael Tremer --- diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c index 64e3e9e5..1a76442d 100644 --- a/src/pakfire/daemon.c +++ b/src/pakfire/daemon.c @@ -911,10 +911,6 @@ struct pakfire_daemon* pakfire_daemon_unref(struct pakfire_daemon* daemon) { return NULL; } -sd_event* pakfire_daemon_loop(struct pakfire_daemon* daemon) { - return sd_event_ref(daemon->loop); -} - struct pakfire_client* pakfire_daemon_client(struct pakfire_daemon* daemon) { return pakfire_client_ref(daemon->client); } diff --git a/src/pakfire/daemon.h b/src/pakfire/daemon.h index 089cd444..0b2a4d59 100644 --- a/src/pakfire/daemon.h +++ b/src/pakfire/daemon.h @@ -34,7 +34,6 @@ int pakfire_daemon_create(struct pakfire_daemon** daemon, struct pakfire_ctx* ct struct pakfire_daemon* pakfire_daemon_ref(struct pakfire_daemon* daemon); struct pakfire_daemon* pakfire_daemon_unref(struct pakfire_daemon* daemon); -sd_event* pakfire_daemon_loop(struct pakfire_daemon* daemon); struct pakfire_client* pakfire_daemon_client(struct pakfire_daemon* daemon); const char* pakfire_daemon_url(struct pakfire_daemon* daemon); diff --git a/src/pakfire/job.c b/src/pakfire/job.c index f1a480d2..dbcb7c51 100644 --- a/src/pakfire/job.c +++ b/src/pakfire/job.c @@ -897,10 +897,9 @@ int pakfire_job_create(struct pakfire_job** job, struct pakfire_ctx* ctx, j->daemon = pakfire_daemon_ref(daemon); // Fetch a reference to the event loop - j->loop = pakfire_daemon_loop(daemon); - if (!j->loop) { - ERROR(j->ctx, "Could not fetch the event loop: %m\n"); - r = -errno; + r = pakfire_ctx_loop(j->ctx, &j->loop); + if (r < 0) { + ERROR(j->ctx, "Could not fetch the event loop: %s\n", strerror(-r)); goto ERROR; }