tag/Builder: CommitNew() returns std::unique_ptr<Tag>

This commit is contained in:
Max Kellermann 2017-12-20 14:49:48 +01:00
parent d293aaf945
commit cb3042ffb2
8 changed files with 16 additions and 14 deletions

View File

@ -115,7 +115,7 @@ find_end_quote(char *p, char *const end)
} }
} }
static Tag * static std::unique_ptr<Tag>
icy_parse_tag(char *p, char *const end) icy_parse_tag(char *p, char *const end)
{ {
assert(p != nullptr); assert(p != nullptr);
@ -210,7 +210,7 @@ IcyMetaDataParser::Meta(const void *data, size_t length)
delete tag; delete tag;
tag = icy_parse_tag(meta_data, meta_data + meta_size); tag = icy_parse_tag(meta_data, meta_data + meta_size).release();
delete[] meta_data; delete[] meta_data;
/* change back to normal data mode */ /* change back to normal data mode */

View File

@ -31,6 +31,7 @@
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "tag/Builder.hxx" #include "tag/Builder.hxx"
#include "tag/Tag.hxx"
#include "event/Call.hxx" #include "event/Call.hxx"
#include "event/Loop.hxx" #include "event/Loop.hxx"
#include "thread/Cond.hxx" #include "thread/Cond.hxx"
@ -222,7 +223,7 @@ CurlInputStream::OnHeaders(unsigned status,
TagBuilder tag_builder; TagBuilder tag_builder;
tag_builder.AddItem(TAG_NAME, i->second.c_str()); tag_builder.AddItem(TAG_NAME, i->second.c_str());
SetTag(tag_builder.CommitNew()); SetTag(tag_builder.CommitNew().release());
} }
if (!icy->IsEnabled()) { if (!icy->IsEnabled()) {

View File

@ -23,6 +23,7 @@
#include "tag/Table.hxx" #include "tag/Table.hxx"
#include "tag/Handler.hxx" #include "tag/Handler.hxx"
#include "tag/Builder.hxx" #include "tag/Builder.hxx"
#include "tag/Tag.hxx"
#include "tag/VorbisComment.hxx" #include "tag/VorbisComment.hxx"
#include "tag/ReplayGain.hxx" #include "tag/ReplayGain.hxx"
#include "ReplayGainInfo.hxx" #include "ReplayGainInfo.hxx"
@ -106,5 +107,5 @@ vorbis_comments_to_tag(char **comments) noexcept
vorbis_comments_scan(comments, add_tag_handler, &tag_builder); vorbis_comments_scan(comments, add_tag_handler, &tag_builder);
return tag_builder.empty() return tag_builder.empty()
? nullptr ? nullptr
: tag_builder.CommitNew(); : tag_builder.CommitNew().release();
} }

View File

@ -144,10 +144,10 @@ TagBuilder::Commit()
return tag; return tag;
} }
Tag * std::unique_ptr<Tag>
TagBuilder::CommitNew() TagBuilder::CommitNew()
{ {
Tag *tag = new Tag(); std::unique_ptr<Tag> tag(new Tag());
Commit(*tag); Commit(*tag);
return tag; return tag;
} }

View File

@ -25,6 +25,7 @@
#include "Compiler.h" #include "Compiler.h"
#include <vector> #include <vector>
#include <memory>
struct StringView; struct StringView;
struct TagItem; struct TagItem;
@ -105,7 +106,7 @@ public:
* returned object is owned by the caller. This object is * returned object is owned by the caller. This object is
* empty afterwards. * empty afterwards.
*/ */
Tag *CommitNew(); std::unique_ptr<Tag> CommitNew();
void SetDuration(SignedSongTime _duration) { void SetDuration(SignedSongTime _duration) {
duration = _duration; duration = _duration;

View File

@ -23,6 +23,7 @@
#include "Handler.hxx" #include "Handler.hxx"
#include "Table.hxx" #include "Table.hxx"
#include "Builder.hxx" #include "Builder.hxx"
#include "Tag.hxx"
#include "Id3MusicBrainz.hxx" #include "Id3MusicBrainz.hxx"
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
@ -336,7 +337,7 @@ tag_id3_import(struct id3_tag *tag)
scan_id3_tag(tag, add_tag_handler, &tag_builder); scan_id3_tag(tag, add_tag_handler, &tag_builder);
return tag_builder.empty() return tag_builder.empty()
? nullptr ? nullptr
: tag_builder.CommitNew(); : tag_builder.CommitNew().release();
} }
bool bool

View File

@ -60,7 +60,7 @@ Tag::Merge(const Tag &base, const Tag &add)
{ {
TagBuilder builder(add); TagBuilder builder(add);
builder.Complement(base); builder.Complement(base);
return builder.CommitNew(); return builder.CommitNew().release();
} }
Tag * Tag *

View File

@ -17,7 +17,7 @@
#include <string.h> #include <string.h>
static Tag * static std::unique_ptr<Tag>
icy_parse_tag(const char *p) icy_parse_tag(const char *p)
{ {
char *q = strdup(p); char *q = strdup(p);
@ -38,17 +38,15 @@ CompareTagTitle(const Tag &tag, const std::string &title)
static void static void
TestIcyParserTitle(const char *input, const char *title) TestIcyParserTitle(const char *input, const char *title)
{ {
Tag *tag = icy_parse_tag(input); const auto tag = icy_parse_tag(input);
CompareTagTitle(*tag, title); CompareTagTitle(*tag, title);
delete tag;
} }
static void static void
TestIcyParserEmpty(const char *input) TestIcyParserEmpty(const char *input)
{ {
Tag *tag = icy_parse_tag(input); const auto tag = icy_parse_tag(input);
CPPUNIT_ASSERT_EQUAL(uint16_t(0), tag->num_items); CPPUNIT_ASSERT_EQUAL(uint16_t(0), tag->num_items);
delete tag;
} }
class IcyTest : public CppUnit::TestFixture { class IcyTest : public CppUnit::TestFixture {