oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/curl: remove the global list of requests

Browse Source 
Unused.
This commit is contained in:
Max Kellermann 2013-11-06 18:38:56 +01:00
parent c9278bfcdf
commit 2520f6fe49
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/input/CurlInputPlugin.cxx
View File

@ -47,7 +47,6 @@
#include <errno.h> #include <errno.h>
#include <list> #include <list>
#include <forward_list>
#include <curl/curl.h> #include <curl/curl.h>
#include <glib.h> #include <glib.h>
@ -206,12 +205,6 @@ static unsigned proxy_port;
static struct { static struct {
CURLM *multi; 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<input_curl *> requests;
CurlSockets *sockets; CurlSockets *sockets;
} curl; } curl;
@ -329,8 +322,6 @@ input_curl_easy_add(struct input_curl *c, Error &error)
assert(c != nullptr); assert(c != nullptr);
assert(c->easy != nullptr); assert(c->easy != nullptr);
curl.requests.push_front(c);
CURLMcode mcode = curl_multi_add_handle(curl.multi, c->easy); CURLMcode mcode = curl_multi_add_handle(curl.multi, c->easy);
if (mcode != CURLM_OK) { if (mcode != CURLM_OK) {
error.Format(curlm_domain, mcode, error.Format(curlm_domain, mcode,
@ -376,8 +367,6 @@ input_curl_easy_free(struct input_curl *c)
if (c->easy == nullptr) if (c->easy == nullptr)
return; return;
curl.requests.remove(c);
curl_multi_remove_handle(curl.multi, c->easy); curl_multi_remove_handle(curl.multi, c->easy);
curl_easy_cleanup(c->easy); curl_easy_cleanup(c->easy);
c->easy = nullptr; c->easy = nullptr;
@ -565,8 +554,6 @@ input_curl_init(const config_param &param, Error &error)
static void static void
input_curl_finish(void) input_curl_finish(void)
{ {
assert(curl.requests.empty());
BlockingCall(io_thread_get(), [](){ BlockingCall(io_thread_get(), [](){
delete curl.sockets; delete curl.sockets;
}); });