ash: rename some function parameters to match dash

[oweals/busybox.git] / shell / match.c

diff --git a/shell/match.c b/shell/match.c
index e77c5d7327681e9f0e59b09a5612d7be1d543633..ee8abb2db2dddad97fa82c6e9f32d83bc576dfc9 100644 (file)
--- a/shell/match.c
+++ b/shell/match.c
@@ -27,8 +27,6 @@
 #include <fnmatch.h>
 #include "match.h"
 
-#define pmatch(a, b) !fnmatch((a), (b), 0)
-
 char* FAST_FUNC scan_and_match(char *string, const char *pattern, unsigned flags)
 {
        char *loc;
@@ -67,17 +65,19 @@ char* FAST_FUNC scan_and_match(char *string, const char *pattern, unsigned flags
 
        while (loc != end) {
                char c;
-               int match;
+               int r;
 
                c = *loc;
                if (flags & SCAN_MATCH_LEFT_HALF) {
                        *loc = '\0';
-                       match = pmatch(pattern, string);
+                       r = fnmatch(pattern, string, 0);
+                       //bb_error_msg("fnmatch('%s','%s',0):%d", pattern, string, r);
                        *loc = c;
                } else {
-                       match = pmatch(pattern, loc);
+                       r = fnmatch(pattern, loc, 0);
+                       //bb_error_msg("fnmatch('%s','%s',0):%d", pattern, loc, r);
                }
-               if (match)
+               if (r == 0) /* match found */
                        return loc;
                if (early_exit) {
 #ifdef STANDALONE