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

input/curl: fold input_curl_easy_add_indirect() into the only caller

This commit is contained in:
Max Kellermann 2017-01-03 10:53:20 +01:00
parent 534e1fa6eb
commit 4397fe3a13
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/input/plugins/CurlInputPlugin.cxx
View File

@ -177,23 +177,6 @@ CurlInputStream::DoResume()
mutex.lock();
}
/**
* Call input_curl_easy_add() in the I/O thread. May be called from
* any thread. Caller must not hold a mutex.
*
* Throws std::runtime_error on error.
*/
static void
input_curl_easy_add_indirect(CurlInputStream *c)
{
assert(c != nullptr);
assert(c->easy);
BlockingCall(io_thread_get(), [c](){
curl_global->Add(c->easy.Get(), *c);
});
}
void
CurlInputStream::FreeEasy()
{
@ -546,7 +529,9 @@ CurlInputStream::Open(const char *url, Mutex &mutex, Cond &cond)
try {
c->InitEasy();
input_curl_easy_add_indirect(c);
BlockingCall(io_thread_get(), [c](){
curl_global->Add(c->easy.Get(), *c);
});
} catch (...) {
delete c;
throw;