input/Curl: remove redundant attribute "url"
Use the "url" attribute from the base class instead.
This commit is contained in:
parent
01f3131c81
commit
2758a734a2
@ -85,7 +85,7 @@ struct input_curl {
|
|||||||
|
|
||||||
/* some buffers which were passed to libcurl, which we have
|
/* some buffers which were passed to libcurl, which we have
|
||||||
too free */
|
too free */
|
||||||
char *url, *range;
|
char *range;
|
||||||
struct curl_slist *request_headers;
|
struct curl_slist *request_headers;
|
||||||
|
|
||||||
/** the curl handles */
|
/** the curl handles */
|
||||||
@ -743,7 +743,6 @@ input_curl_free(struct input_curl *c)
|
|||||||
if (c->postponed_error != NULL)
|
if (c->postponed_error != NULL)
|
||||||
g_error_free(c->postponed_error);
|
g_error_free(c->postponed_error);
|
||||||
|
|
||||||
g_free(c->url);
|
|
||||||
input_stream_deinit(&c->base);
|
input_stream_deinit(&c->base);
|
||||||
g_free(c);
|
g_free(c);
|
||||||
}
|
}
|
||||||
@ -1104,7 +1103,7 @@ input_curl_easy_init(struct input_curl *c, GError **error_r)
|
|||||||
g_free(proxy_auth_str);
|
g_free(proxy_auth_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
code = curl_easy_setopt(c->easy, CURLOPT_URL, c->url);
|
code = curl_easy_setopt(c->easy, CURLOPT_URL, c->base.uri);
|
||||||
if (code != CURLE_OK) {
|
if (code != CURLE_OK) {
|
||||||
g_set_error(error_r, curl_quark(), code,
|
g_set_error(error_r, curl_quark(), code,
|
||||||
"curl_easy_setopt() failed: %s",
|
"curl_easy_setopt() failed: %s",
|
||||||
@ -1244,7 +1243,6 @@ input_curl_open(const char *url, GMutex *mutex, GCond *cond,
|
|||||||
input_stream_init(&c->base, &input_plugin_curl, url,
|
input_stream_init(&c->base, &input_plugin_curl, url,
|
||||||
mutex, cond);
|
mutex, cond);
|
||||||
|
|
||||||
c->url = g_strdup(url);
|
|
||||||
c->buffers = g_queue_new();
|
c->buffers = g_queue_new();
|
||||||
|
|
||||||
icy_clear(&c->icy_metadata);
|
icy_clear(&c->icy_metadata);
|
||||||
|
Loading…
Reference in New Issue
Block a user