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

db/update/ExcludeList: make no-op if GLib is disabled 

Quick hack to allow using the database without GLib (for Android).
This commit is contained in:
Max Kellermann 2014-03-01 08:16:13 +01:00
parent ebc0168072
commit 7ccc609da2
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db/update/ExcludeList.cxx
View File

@ -39,6 +39,7 @@ static constexpr Domain exclude_list_domain("exclude_list");
bool bool
ExcludeList::LoadFile(Path path_fs) ExcludeList::LoadFile(Path path_fs)
{ {
#ifdef HAVE_GLIB
FILE *file = FOpen(path_fs, FOpenMode::ReadText); FILE *file = FOpen(path_fs, FOpenMode::ReadText);
if (file == nullptr) { if (file == nullptr) {
const int e = errno; const int e = errno;
@ -64,6 +65,10 @@ ExcludeList::LoadFile(Path path_fs)
} }
fclose(file); fclose(file);
#else
// TODO: implement
(void)path_fs;
#endif
return true; return true;
} }
@ -75,9 +80,14 @@ ExcludeList::Check(Path name_fs) const
/* XXX include full path name in check */ /* XXX include full path name in check */
#ifdef HAVE_GLIB
for (const auto &i : patterns) for (const auto &i : patterns)
if (i.Check(name_fs.c_str())) if (i.Check(name_fs.c_str()))
return true; return true;
#else
// TODO: implement
(void)name_fs;
#endif
return false; return false;
} }

12
src/db/update/ExcludeList.hxx
View File

@ -25,15 +25,19 @@
#ifndef MPD_EXCLUDE_H #ifndef MPD_EXCLUDE_H
#define MPD_EXCLUDE_H #define MPD_EXCLUDE_H
#include "check.h"
#include "Compiler.h" #include "Compiler.h"
#include <forward_list> #include <forward_list>
#ifdef HAVE_GLIB
#include <glib.h> #include <glib.h>
#endif
class Path; class Path;
class ExcludeList { class ExcludeList {
#ifdef HAVE_GLIB
class Pattern { class Pattern {
GPatternSpec *pattern; GPatternSpec *pattern;
@ -57,11 +61,19 @@ class ExcludeList {
}; };
std::forward_list<Pattern> patterns; std::forward_list<Pattern> patterns;
#else
// TODO: implement
#endif
public: public:
gcc_pure gcc_pure
bool IsEmpty() const { bool IsEmpty() const {
#ifdef HAVE_GLIB
return patterns.empty(); return patterns.empty();
#else
// TODO: implement
return true;
#endif
} }
/** /**