Skip to content

M
mpd
Commit e9f16fca authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

input/curl: rename "error" to "error_buffer"

parent 3d30de91
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/input/plugins/CurlInputPlugin.cxx
View file @ e9f16fca
...@@ -153,7 +153,7 @@ struct CurlInputStream { ...@@ -153,7 +153,7 @@ struct CurlInputStream {
bool paused; bool paused;
/** error message provided by libcurl */ /** error message provided by libcurl */
char error[CURL_ERROR_SIZE]; char error_buffer[CURL_ERROR_SIZE];
/** parser for icy-metadata */ /** parser for icy-metadata */
IcyMetaDataParser icy; IcyMetaDataParser icy;
...@@ -503,7 +503,7 @@ input_curl_request_done(CurlInputStream *c, CURLcode result, long status) ...@@ -503,7 +503,7 @@ input_curl_request_done(CurlInputStream *c, CURLcode result, long status)
if (result != CURLE_OK) { if (result != CURLE_OK) {
c->postponed_error.Format(curl_domain, result, c->postponed_error.Format(curl_domain, result,
"curl failed: %s", c->error); "curl failed: %s", c->error_buffer);
} else if (status < 200 || status >= 300) { } else if (status < 200 || status >= 300) {
c->postponed_error.Format(http_domain, status, c->postponed_error.Format(http_domain, status,
"got HTTP status %ld", "got HTTP status %ld",
...@@ -992,7 +992,7 @@ input_curl_easy_init(CurlInputStream *c, Error &error) ...@@ -992,7 +992,7 @@ input_curl_easy_init(CurlInputStream *c, Error &error)
curl_easy_setopt(c->easy, CURLOPT_NETRC, 1); curl_easy_setopt(c->easy, CURLOPT_NETRC, 1);
curl_easy_setopt(c->easy, CURLOPT_MAXREDIRS, 5); curl_easy_setopt(c->easy, CURLOPT_MAXREDIRS, 5);
curl_easy_setopt(c->easy, CURLOPT_FAILONERROR, true); curl_easy_setopt(c->easy, CURLOPT_FAILONERROR, true);
curl_easy_setopt(c->easy, CURLOPT_ERRORBUFFER, c->error); curl_easy_setopt(c->easy, CURLOPT_ERRORBUFFER, c->error_buffer);
curl_easy_setopt(c->easy, CURLOPT_NOPROGRESS, 1l); curl_easy_setopt(c->easy, CURLOPT_NOPROGRESS, 1l);
curl_easy_setopt(c->easy, CURLOPT_NOSIGNAL, 1l); curl_easy_setopt(c->easy, CURLOPT_NOSIGNAL, 1l);
curl_easy_setopt(c->easy, CURLOPT_CONNECTTIMEOUT, 10l); curl_easy_setopt(c->easy, CURLOPT_CONNECTTIMEOUT, 10l);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment