From 2520f6fe494859e330770b792a10399d8abe4dbc Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 6 Nov 2013 18:38:56 +0100 Subject: input/curl: remove the global list of requests Unused. --- src/input/CurlInputPlugin.cxx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx index 9869f5b58..7fe4dab1f 100644 --- a/src/input/CurlInputPlugin.cxx +++ b/src/input/CurlInputPlugin.cxx @@ -47,7 +47,6 @@ #include #include -#include #include #include @@ -206,12 +205,6 @@ static unsigned proxy_port; static struct { CURLM *multi; - /** - * A linked list of all active HTTP requests. An active - * request is one that doesn't have the "eof" flag set. - */ - std::forward_list requests; - CurlSockets *sockets; } curl; @@ -329,8 +322,6 @@ input_curl_easy_add(struct input_curl *c, Error &error) assert(c != nullptr); assert(c->easy != nullptr); - curl.requests.push_front(c); - CURLMcode mcode = curl_multi_add_handle(curl.multi, c->easy); if (mcode != CURLM_OK) { error.Format(curlm_domain, mcode, @@ -376,8 +367,6 @@ input_curl_easy_free(struct input_curl *c) if (c->easy == nullptr) return; - curl.requests.remove(c); - curl_multi_remove_handle(curl.multi, c->easy); curl_easy_cleanup(c->easy); c->easy = nullptr; @@ -565,8 +554,6 @@ input_curl_init(const config_param ¶m, Error &error) static void input_curl_finish(void) { - assert(curl.requests.empty()); - BlockingCall(io_thread_get(), [](){ delete curl.sockets; }); -- cgit v1.2.3