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

output/roar: use const_cast instead of g_strdup()

Browse Source
This commit is contained in:
Max Kellermann
2013-10-15 23:14:34 +02:00
parent 85003429af
commit 328131b7aa
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/output/RoarOutputPlugin.cxx
View File

@@ -27,8 +27,6 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include <glib.h>
#include <string> #include <string>
/* libroar/services.h declares roar_service_stream::new - work around /* libroar/services.h declares roar_service_stream::new - work around
@@ -372,14 +370,13 @@ RoarOutput::SendTag(const Tag &tag)
size_t cnt = 1; size_t cnt = 1;
struct roar_keyval vals[32]; struct roar_keyval vals[32];
memset(vals, 0, sizeof(vals));
char uuid_buf[32][64]; char uuid_buf[32][64];
char timebuf[16]; char timebuf[16];
snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d", snprintf(timebuf, sizeof(timebuf), "%02d:%02d:%02d",
tag.time / 3600, (tag.time % 3600) / 60, tag.time % 60); tag.time / 3600, (tag.time % 3600) / 60, tag.time % 60);
vals[0].key = g_strdup("LENGTH"); vals[0].key = const_cast<char *>("LENGTH");
vals[0].value = timebuf; vals[0].value = timebuf;
for (unsigned i = 0; i < tag.num_items && cnt < 32; i++) for (unsigned i = 0; i < tag.num_items && cnt < 32; i++)
@@ -388,13 +385,13 @@ RoarOutput::SendTag(const Tag &tag)
const char *key = roar_tag_convert(tag.items[i]->type, const char *key = roar_tag_convert(tag.items[i]->type,
&is_uuid); &is_uuid);
if (key != nullptr) { if (key != nullptr) {
vals[cnt].key = const_cast<char *>(key);
if (is_uuid) { if (is_uuid) {
snprintf(uuid_buf[cnt], sizeof(uuid_buf[0]), "{UUID}%s", snprintf(uuid_buf[cnt], sizeof(uuid_buf[0]), "{UUID}%s",
tag.items[i]->value); tag.items[i]->value);
vals[cnt].key = g_strdup(key);
vals[cnt].value = uuid_buf[cnt]; vals[cnt].value = uuid_buf[cnt];
} else { } else {
vals[cnt].key = g_strdup(key);
vals[cnt].value = tag.items[i]->value; vals[cnt].value = tag.items[i]->value;
} }
@@ -403,9 +400,6 @@ RoarOutput::SendTag(const Tag &tag)
} }
roar_vs_meta(vss, vals, cnt, &(err)); roar_vs_meta(vss, vals, cnt, &(err));
for (unsigned i = 0; i < 32; i++)
g_free(vals[i].key);
} }
static void static void