diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-10 22:21:30 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-10 22:21:30 +0100 |
| commit | 2758a734a26830fdabda543bb969a2d6835ba9f8 (patch) | |
| tree | ea3e06e49660e35976405be893451a35282246b0 | |
| parent | 01f3131c819617d78ef74746fd008e4e8c2712ef (diff) | |
| download | mpd-2758a734a26830fdabda543bb969a2d6835ba9f8.tar.gz mpd-2758a734a26830fdabda543bb969a2d6835ba9f8.tar.xz mpd-2758a734a26830fdabda543bb969a2d6835ba9f8.zip | |
input/Curl: remove redundant attribute "url"
Use the "url" attribute from the base class instead.
Diffstat (limited to '')
| -rw-r--r-- | src/input/CurlInputPlugin.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx index f3a5c87d2..8ca05d24f 100644 --- a/src/input/CurlInputPlugin.cxx +++ b/src/input/CurlInputPlugin.cxx @@ -85,7 +85,7 @@ struct input_curl { /* some buffers which were passed to libcurl, which we have too free */ - char *url, *range; + char *range; struct curl_slist *request_headers; /** the curl handles */ @@ -743,7 +743,6 @@ input_curl_free(struct input_curl *c) if (c->postponed_error != NULL) g_error_free(c->postponed_error); - g_free(c->url); input_stream_deinit(&c->base); g_free(c); } @@ -1104,7 +1103,7 @@ input_curl_easy_init(struct input_curl *c, GError **error_r) 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) { g_set_error(error_r, curl_quark(), code, "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, mutex, cond); - c->url = g_strdup(url); c->buffers = g_queue_new(); icy_clear(&c->icy_metadata); |