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

input/curl: use std::string for meta_name

Browse Source 
Automatic memory management.
This commit is contained in:
Max Kellermann
2013-10-19 17:18:56 +02:00
parent 5dc4cbdf82
commit 0a213ddf03
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/input/CurlInputPlugin.cxx
View File

@@ -158,7 +158,7 @@ struct input_curl {
IcyMetaDataParser icy; IcyMetaDataParser icy;
/** the stream name from the icy-name response header */ /** the stream name from the icy-name response header */
char *meta_name; std::string meta_name;
/** the tag object ready to be requested via /** the tag object ready to be requested via
input_stream::ReadTag() */ input_stream::ReadTag() */
@@ -170,7 +170,6 @@ struct input_curl {
:base(input_plugin_curl, url, mutex, cond), :base(input_plugin_curl, url, mutex, cond),
request_headers(nullptr), request_headers(nullptr),
paused(false), paused(false),
meta_name(nullptr),
tag(nullptr) {} tag(nullptr) {}
~input_curl(); ~input_curl();
@@ -632,8 +631,6 @@ input_curl::~input_curl()
{ {
delete tag; delete tag;
g_free(meta_name);
input_curl_easy_free_indirect(this); input_curl_easy_free_indirect(this);
} }
@@ -736,8 +733,8 @@ copy_icy_tag(struct input_curl *c)
delete c->tag; delete c->tag;
if (c->meta_name != NULL && !tag->HasType(TAG_NAME)) if (!c->meta_name.empty() && !tag->HasType(TAG_NAME))
tag->AddItem(TAG_NAME, c->meta_name); tag->AddItem(TAG_NAME, c->meta_name.c_str());
c->tag = tag; c->tag = tag;
} }
@@ -862,13 +859,12 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
} else if (g_ascii_strcasecmp(name, "icy-name") == 0 || } else if (g_ascii_strcasecmp(name, "icy-name") == 0 ||
g_ascii_strcasecmp(name, "ice-name") == 0 || g_ascii_strcasecmp(name, "ice-name") == 0 ||
g_ascii_strcasecmp(name, "x-audiocast-name") == 0) { g_ascii_strcasecmp(name, "x-audiocast-name") == 0) {
g_free(c->meta_name); c->meta_name.assign(value, end);
c->meta_name = g_strndup(value, end - value);
delete c->tag; delete c->tag;
c->tag = new Tag(); c->tag = new Tag();
c->tag->AddItem(TAG_NAME, c->meta_name); c->tag->AddItem(TAG_NAME, c->meta_name.c_str());
} else if (g_ascii_strcasecmp(name, "icy-metaint") == 0) { } else if (g_ascii_strcasecmp(name, "icy-metaint") == 0) {
char buffer[64]; char buffer[64];
size_t icy_metaint; size_t icy_metaint;