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

SongSticker: don't use GLib

Browse Source
This commit is contained in:
Max Kellermann
2014-10-24 20:26:59 +02:00
parent de7e4f0db7
commit 3e641e2147
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -575,8 +575,6 @@ AC_ARG_ENABLE(sqlite,
AS_HELP_STRING([--enable-sqlite], AS_HELP_STRING([--enable-sqlite],
[enable support for the SQLite database]),, [enable support for the SQLite database]),,
[enable_sqlite=$database_auto]) [enable_sqlite=$database_auto])
MPD_DEPENDS([enable_sqlite], [enable_glib],
[Cannot use --enable-sqlite with --disable-glib])
AC_ARG_ENABLE(systemd-daemon, AC_ARG_ENABLE(systemd-daemon,
AS_HELP_STRING([--enable-systemd-daemon], AS_HELP_STRING([--enable-systemd-daemon],

7
src/sticker/SongSticker.cxx
View File

@@ -23,8 +23,7 @@
#include "db/LightSong.hxx" #include "db/LightSong.hxx"
#include "db/Interface.hxx" #include "db/Interface.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Alloc.hxx"
#include <glib.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@@ -109,7 +108,7 @@ sticker_song_find(const Database &db, const char *base_uri, const char *name,
if (*data.base_uri != 0) if (*data.base_uri != 0)
/* append slash to base_uri */ /* append slash to base_uri */
data.base_uri = allocated = data.base_uri = allocated =
g_strconcat(data.base_uri, "/", nullptr); xstrcatdup(data.base_uri, "/");
else else
/* searching in root directory - no trailing slash */ /* searching in root directory - no trailing slash */
allocated = nullptr; allocated = nullptr;
@@ -118,7 +117,7 @@ sticker_song_find(const Database &db, const char *base_uri, const char *name,
bool success = sticker_find("song", data.base_uri, name, bool success = sticker_find("song", data.base_uri, name,
sticker_song_find_cb, &data); sticker_song_find_cb, &data);
g_free(allocated); free(allocated);
return success; return success;
} }