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

sticker/SongSticker: use AllocatedString for concatenation

Browse Source
This commit is contained in:
Max Kellermann 2021-10-13 12:18:17 +02:00
parent e1c16d78e4
commit 7d4de71899
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sticker/SongSticker.cxx
View File

@ -22,12 +22,13 @@
#include "Database.hxx" #include "Database.hxx"
#include "song/LightSong.hxx" #include "song/LightSong.hxx"
#include "db/Interface.hxx" #include "db/Interface.hxx"
#include "util/Alloc.hxx" #include "util/AllocatedString.hxx"
#include "util/ScopeExit.hxx"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
using std::string_view_literals::operator""sv;
std::string std::string
sticker_song_get_value(StickerDatabase &db, sticker_song_get_value(StickerDatabase &db,
const LightSong &song, const char *name) const LightSong &song, const char *name)
@ -116,17 +117,15 @@ sticker_song_find(StickerDatabase &sticker_database, const Database &db,
data.func = func; data.func = func;
data.user_data = user_data; data.user_data = user_data;
char *allocated; AllocatedString allocated;
data.base_uri = base_uri; data.base_uri = base_uri;
if (*data.base_uri != 0) if (*data.base_uri != 0) {
/* append slash to base_uri */ /* append slash to base_uri */
data.base_uri = allocated = allocated = AllocatedString{std::string_view{data.base_uri}, "/"sv};
xstrcatdup(data.base_uri, "/"); data.base_uri = allocated.c_str();
else } else {
/* searching in root directory - no trailing slash */ /* searching in root directory - no trailing slash */
allocated = nullptr; }
AtScopeExit(allocated) { free(allocated); };
data.base_uri_length = strlen(data.base_uri); data.base_uri_length = strlen(data.base_uri);