daemon: Remove the HTTP client

This is now all fully merged into the high-level client.

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

diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c
index d425d27946581372aa2bb42efb38255d9c387213..64e3e9e573f111dd8571e8539cd55abdb3cf16ad 100644 (file)
--- a/src/pakfire/daemon.c
+++ b/src/pakfire/daemon.c
@@ -33,7 +33,6 @@
 #include <pakfire/client.h>
 #include <pakfire/ctx.h>
 #include <pakfire/daemon.h>
-#include <pakfire/httpclient.h>
 #include <pakfire/job.h>
 #include <pakfire/json.h>
 #include <pakfire/proctitle.h>
@@ -50,9 +49,6 @@ struct pakfire_daemon {
        struct pakfire_ctx* ctx;
        int nrefs;
 
-       // HTTP Client
-       struct pakfire_httpclient* httpclient;
-
        // Pakfire Client
        struct pakfire_client* client;
 
@@ -825,8 +821,6 @@ static void pakfire_daemon_free(struct pakfire_daemon* daemon) {
 
        if (daemon->builder)
                pakfire_builder_unref(daemon->builder);
-       if (daemon->httpclient)
-               pakfire_httpclient_unref(daemon->httpclient);
        if (daemon->client)
                pakfire_client_unref(daemon->client);
        if (daemon->cgroup)
@@ -891,11 +885,6 @@ int pakfire_daemon_create(struct pakfire_daemon** daemon, struct pakfire_ctx* ct
        if (r < 0)
                goto ERROR;
 
-       // Create the HTTP client
-       r = pakfire_httpclient_create(&d->httpclient, d->ctx, d->loop);
-       if (r < 0)
-               goto ERROR;
-
        // Return the pointer
        *daemon = d;
 
@@ -930,10 +919,6 @@ struct pakfire_client* pakfire_daemon_client(struct pakfire_daemon* daemon) {
        return pakfire_client_ref(daemon->client);
 }
 
-struct pakfire_httpclient* pakfire_daemon_httpclient(struct pakfire_daemon* daemon) {
-       return pakfire_httpclient_ref(daemon->httpclient);
-}
-
 const char* pakfire_daemon_url(struct pakfire_daemon* daemon) {
        return daemon->url;
 }

diff --git a/src/pakfire/daemon.h b/src/pakfire/daemon.h
index 5d80cada638ae9114b1eb58a816d8bdf9d8dc8b8..089cd444497cebc448c4b4c93c038225ce63f95a 100644 (file)
--- a/src/pakfire/daemon.h
+++ b/src/pakfire/daemon.h
@@ -36,7 +36,6 @@ 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);
-struct pakfire_httpclient* pakfire_daemon_httpclient(struct pakfire_daemon* daemon);
 
 const char* pakfire_daemon_url(struct pakfire_daemon* daemon);