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

util/SplitString: new utility class

Browse Source 
To replace g_strdup().
This commit is contained in:
Max Kellermann
2013-12-14 12:58:26 +01:00
parent c7e7c819a2
commit 635a67afac
5 changed files with 120 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/decoder/FlacMetadata.cxx
View File

@@ -26,6 +26,7 @@
#include "tag/TagBuilder.hxx"
#include "ReplayGainInfo.hxx"
#include "util/ASCII.hxx"
#include "util/SplitString.hxx"
#include <glib.h>
@@ -165,16 +166,12 @@ flac_scan_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
const struct tag_handler *handler, void *handler_ctx)
{
if (handler->pair != nullptr) {
char *name = g_strdup((const char*)entry->entry);
char *value = strchr(name, '=');
if (value != nullptr && value > name) {
*value++ = 0;
const char *comment = (const char *)entry->entry;
const SplitString split(comment, '=');
if (split.IsDefined() && !split.IsEmpty())
tag_handler_invoke_pair(handler, handler_ctx,
name, value);
}
g_free(name);
split.GetFirst(),
split.GetSecond());
}
for (const struct tag_table *i = xiph_tags; i->name != nullptr; ++i)

16
src/decoder/VorbisComments.cxx
View File

@@ -25,8 +25,7 @@
#include "tag/TagBuilder.hxx"
#include "ReplayGainInfo.hxx"
#include "util/ASCII.hxx"
#include <glib.h>
#include "util/SplitString.hxx"
#include <stddef.h>
#include <string.h>
@@ -102,16 +101,11 @@ vorbis_scan_comment(const char *comment,
const struct tag_handler *handler, void *handler_ctx)
{
if (handler->pair != nullptr) {
char *name = g_strdup(comment);
char *value = strchr(name, '=');
if (value != nullptr && value > name) {
*value++ = 0;
const SplitString split(comment, '=');
if (split.IsDefined() && !split.IsEmpty())
tag_handler_invoke_pair(handler, handler_ctx,
name, value);
}
g_free(name);
split.GetFirst(),
split.GetSecond());
}
for (const struct tag_table *i = xiph_tags; i->name != nullptr; ++i)