diff options
| author | Max Kellermann <max@duempel.org> | 2015-06-22 21:01:46 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-06-22 22:12:08 +0200 |
| commit | 50eac9b49e8171cd0f217fca2ec7e673f191d0c7 (patch) | |
| tree | 2b1a61d83bf581e9c8b62839f992fa90bfcce0de /src/db/update/ExcludeList.hxx | |
| parent | e0405f1781f06276b61285c62266b70dc449cfd4 (diff) | |
| download | mpd-50eac9b49e8171cd0f217fca2ec7e673f191d0c7.tar.gz mpd-50eac9b49e8171cd0f217fca2ec7e673f191d0c7.tar.xz mpd-50eac9b49e8171cd0f217fca2ec7e673f191d0c7.zip | |
db/update/ExcludeList: move class Pattern to fs/Glob.hxx
Diffstat (limited to 'src/db/update/ExcludeList.hxx')
| -rw-r--r-- | src/db/update/ExcludeList.hxx | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/src/db/update/ExcludeList.hxx b/src/db/update/ExcludeList.hxx index ae196a7b2..eae0cac40 100644 --- a/src/db/update/ExcludeList.hxx +++ b/src/db/update/ExcludeList.hxx @@ -27,40 +27,17 @@ #include "check.h" #include "Compiler.h" +#include "fs/Glob.hxx" +#ifdef HAVE_CLASS_GLOB #include <forward_list> - -#ifdef HAVE_GLIB -#include <glib.h> #endif class Path; class ExcludeList { -#ifdef HAVE_GLIB - class Pattern { - GPatternSpec *pattern; - - public: - Pattern(const char *_pattern) - :pattern(g_pattern_spec_new(_pattern)) {} - - Pattern(Pattern &&other) - :pattern(other.pattern) { - other.pattern = nullptr; - } - - ~Pattern() { - g_pattern_spec_free(pattern); - } - - gcc_pure - bool Check(const char *name_fs) const { - return g_pattern_match_string(pattern, name_fs); - } - }; - - std::forward_list<Pattern> patterns; +#ifdef HAVE_CLASS_GLOB + std::forward_list<Glob> patterns; #else // TODO: implement #endif @@ -68,7 +45,7 @@ class ExcludeList { public: gcc_pure bool IsEmpty() const { -#ifdef HAVE_GLIB +#ifdef HAVE_CLASS_GLOB return patterns.empty(); #else // TODO: implement |