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

command/Database: use std::unique_ptr

Browse Source
This commit is contained in:
Max Kellermann 2016-10-29 10:37:18 +02:00
parent 131441846b
commit 9a9da7b077
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/command/DatabaseCommands.cxx
View File

@ -35,6 +35,8 @@
#include "SongFilter.hxx" #include "SongFilter.hxx"
#include "BulkEdit.hxx" #include "BulkEdit.hxx"
#include <memory>
CommandResult CommandResult
handle_listfiles_db(Client &client, Response &r, const char *uri) handle_listfiles_db(Client &client, Response &r, const char *uri)
{ {
@ -207,7 +209,7 @@ handle_list(Client &client, Request args, Response &r)
return CommandResult::ERROR; return CommandResult::ERROR;
} }
SongFilter *filter = nullptr; std::unique_ptr<SongFilter> filter;
tag_mask_t group_mask = 0; tag_mask_t group_mask = 0;
if (args.size == 1) { if (args.size == 1) {
@ -219,7 +221,8 @@ handle_list(Client &client, Request args, Response &r)
return CommandResult::ERROR; return CommandResult::ERROR;
} }
filter = new SongFilter((unsigned)TAG_ARTIST, args.shift()); filter.reset(new SongFilter((unsigned)TAG_ARTIST,
args.shift()));
} }
while (args.size >= 2 && while (args.size >= 2 &&
@ -239,9 +242,8 @@ handle_list(Client &client, Request args, Response &r)
} }
if (!args.IsEmpty()) { if (!args.IsEmpty()) {
filter = new SongFilter(); filter.reset(new SongFilter());
if (!filter->Parse(args, false)) { if (!filter->Parse(args, false)) {
delete filter;
r.Error(ACK_ERROR_ARG, "not able to parse args"); r.Error(ACK_ERROR_ARG, "not able to parse args");
return CommandResult::ERROR; return CommandResult::ERROR;
} }
@ -249,7 +251,6 @@ handle_list(Client &client, Request args, Response &r)
if (tagType < TAG_NUM_OF_ITEM_TYPES && if (tagType < TAG_NUM_OF_ITEM_TYPES &&
group_mask & (tag_mask_t(1) << tagType)) { group_mask & (tag_mask_t(1) << tagType)) {
delete filter;
r.Error(ACK_ERROR_ARG, "Conflicting group"); r.Error(ACK_ERROR_ARG, "Conflicting group");
return CommandResult::ERROR; return CommandResult::ERROR;
} }
@ -257,12 +258,10 @@ handle_list(Client &client, Request args, Response &r)
Error error; Error error;
CommandResult ret = CommandResult ret =
PrintUniqueTags(r, client.partition, PrintUniqueTags(r, client.partition,
tagType, group_mask, filter, error) tagType, group_mask, filter.get(), error)
? CommandResult::OK ? CommandResult::OK
: print_error(r, error); : print_error(r, error);
delete filter;
return ret; return ret;
} }