The other glob patterns are hard-coded in dowild(). There is no need
to macrofy '!' or '^'. Remove the NEGATE_CLASS and REGATE_CLASS2
defines, then refactor the code.
Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
---
(no changes since v1)
wildmatch.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/wildmatch.c b/wildmatch.c
index a510b3fd23..93800b8eac 100644
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -14,10 +14,6 @@
typedef unsigned char uchar;
-/* What character marks an inverted character class? */
-#define NEGATE_CLASS '!'
-#define NEGATE_CLASS2 '^'
-
#define CC_EQ(class, len, litmatch) ((len) == sizeof (litmatch)-1 \
&& *(class) == *(litmatch) \
&& strncmp((char*)class, litmatch, len) == 0)
@@ -137,12 +133,8 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
return WM_ABORT_ALL;
case '[':
p_ch = *++p;
-#ifdef NEGATE_CLASS2
- if (p_ch == NEGATE_CLASS2)
- p_ch = NEGATE_CLASS;
-#endif
/* Assign literal 1/0 because of "matched" comparison. */
- negated = p_ch == NEGATE_CLASS ? 1 : 0;
+ negated = p_ch == '!' || p_ch == '^' ? 1 : 0;
if (negated) {
/* Inverted character class. */
p_ch = *++p;
--
2.34.1
