diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-19 17:15:17 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-19 17:15:17 +0200 |
| commit | 1434e5a22e82b4176c24c536a91eefa183b78516 (patch) | |
| tree | 64f2fa13494de041b1583c5c9d98d36f04447c7d /src/input | |
| parent | 9acc1e1e97ff75e681ef5527f512e57917c617f3 (diff) | |
| download | mpd-1434e5a22e82b4176c24c536a91eefa183b78516.tar.gz mpd-1434e5a22e82b4176c24c536a91eefa183b78516.tar.xz mpd-1434e5a22e82b4176c24c536a91eefa183b78516.zip | |
decoder/gme,input/curl,...: use static buffers instead of g_strdup_printf()
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/CurlInputPlugin.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx index de3e83a86..b7142a7e6 100644 --- a/src/input/CurlInputPlugin.cxx +++ b/src/input/CurlInputPlugin.cxx @@ -134,7 +134,7 @@ struct input_curl { /* some buffers which were passed to libcurl, which we have too free */ - char *range; + char range[32]; struct curl_slist *request_headers; /** the curl handles */ @@ -168,7 +168,7 @@ struct input_curl { input_curl(const char *url, Mutex &mutex, Cond &cond) :base(input_plugin_curl, url, mutex, cond), - range(nullptr), request_headers(nullptr), + request_headers(nullptr), paused(false), meta_name(nullptr), tag(nullptr) {} @@ -383,9 +383,6 @@ input_curl_easy_free(struct input_curl *c) curl_slist_free_all(c->request_headers); c->request_headers = NULL; - - g_free(c->range); - c->range = NULL; } /** @@ -958,10 +955,11 @@ input_curl_easy_init(struct input_curl *c, Error &error) curl_easy_setopt(c->easy, CURLOPT_PROXYPORT, (long)proxy_port); if (proxy_user != NULL && proxy_password != NULL) { - char *proxy_auth_str = - g_strconcat(proxy_user, ":", proxy_password, NULL); + char proxy_auth_str[1024]; + snprintf(proxy_auth_str, sizeof(proxy_auth_str), + "%s:%s", + proxy_user, proxy_password); curl_easy_setopt(c->easy, CURLOPT_PROXYUSERPWD, proxy_auth_str); - g_free(proxy_auth_str); } code = curl_easy_setopt(c->easy, CURLOPT_URL, c->base.uri.c_str()); @@ -1062,7 +1060,7 @@ input_curl_seek(struct input_stream *is, InputPlugin::offset_type offset, /* send the "Range" header */ if (is->offset > 0) { - c->range = g_strdup_printf("%lld-", (long long)is->offset); + sprintf(c->range, "%lld-", (long long)is->offset); curl_easy_setopt(c->easy, CURLOPT_RANGE, c->range); } |