wildmatch: hide internal return values

WM_ABORT_ALL and WM_ABORT_TO_STARSTAR are used internally to limit
backtracking when a match fails, they are not of interest to the caller
and so should not be public.

Suggested-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/wildmatch.c b/wildmatch.c
index 694d2f8e405287c154ff6e89911b8545f15e306d..372aa6ea5450c903aa56ec29a6ed1f2d9662affe 100644 (file)
--- a/wildmatch.c
+++ b/wildmatch.c
@@ -14,6 +14,10 @@
 
 typedef unsigned char uchar;
 
+/* Internal return values */
+#define WM_ABORT_ALL -1
+#define WM_ABORT_TO_STARSTAR -2
+
 /* What character marks an inverted character class? */
 #define NEGATE_CLASS   '!'
 #define NEGATE_CLASS2  '^'
@@ -278,5 +282,6 @@ static int dowild(const uchar *p, const uchar *text, unsigned int flags)
 /* Match the "pattern" against the "text" string. */
 int wildmatch(const char *pattern, const char *text, unsigned int flags)
 {
-       return dowild((const uchar*)pattern, (const uchar*)text, flags);
+       int res = dowild((const uchar*)pattern, (const uchar*)text, flags);
+       return res == WM_MATCH ? WM_MATCH : WM_NOMATCH;
 }

diff --git a/wildmatch.h b/wildmatch.h
index 599369629824ec5f2bbb8e8affb19e8cc9058cc3..0c890cb56ba303db40a4c4f3244cc4a672303ac1 100644 (file)
--- a/wildmatch.h
+++ b/wildmatch.h
@@ -6,8 +6,6 @@
 
 #define WM_NOMATCH 1
 #define WM_MATCH 0
-#define WM_ABORT_ALL -1
-#define WM_ABORT_TO_STARSTAR -2
 
 int wildmatch(const char *pattern, const char *text, unsigned int flags);
 #endif