Skip to content

M
mpd
Commit 2a086d20 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

fs/Glob: remove GLib implementation

I suppose there is no non-WIN32 operating system that doesn't have fnmatch(). So let's remove the GLib implementation.
parent d5cfa6d4
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 19 deletions
src/fs/Glob.hxx
View file @ 2a086d20
...@@ -30,9 +30,6 @@ ...@@ -30,9 +30,6 @@
#define HAVE_CLASS_GLOB #define HAVE_CLASS_GLOB
#include <string> #include <string>
#include <shlwapi.h> #include <shlwapi.h>
#elif defined(HAVE_GLIB)
#define HAVE_CLASS_GLOB
#include <glib.h>
#endif #endif
#ifdef HAVE_CLASS_GLOB #ifdef HAVE_CLASS_GLOB
...@@ -45,8 +42,6 @@ ...@@ -45,8 +42,6 @@
class Glob { class Glob {
#if defined(HAVE_FNMATCH) || defined(WIN32) #if defined(HAVE_FNMATCH) || defined(WIN32)
std::string pattern; std::string pattern;
#else
GPatternSpec *pattern;
#endif #endif
public: public:
...@@ -56,18 +51,6 @@ public: ...@@ -56,18 +51,6 @@ public:
Glob(Glob &&other) Glob(Glob &&other)
:pattern(std::move(other.pattern)) {} :pattern(std::move(other.pattern)) {}
#else
explicit Glob(const char *_pattern)
:pattern(g_pattern_spec_new(_pattern)) {}
Glob(Glob &&other)
:pattern(other.pattern) {
other.pattern = nullptr;
}
~Glob() {
g_pattern_spec_free(pattern);
}
#endif #endif
gcc_pure gcc_pure
...@@ -76,8 +59,6 @@ public: ...@@ -76,8 +59,6 @@ public:
return fnmatch(pattern.c_str(), name_fs, 0) == 0; return fnmatch(pattern.c_str(), name_fs, 0) == 0;
#elif defined(WIN32) #elif defined(WIN32)
return PathMatchSpecA(name_fs, pattern.c_str()); return PathMatchSpecA(name_fs, pattern.c_str());
#else
return g_pattern_match_string(pattern, name_fs);
#endif #endif
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment