Forráskód Böngészése

* Made match functions use unsigned char as they were originally

svn: 1532
Bryan Drewery 21 éve
szülő
commit
21a0d224c0
2 módosított fájl, 13 hozzáadás és 7 törlés
  1. 5 5
      src/match.c
  2. 8 2
      src/match.h

+ 5 - 5
src/match.c

@@ -35,13 +35,13 @@
 #define MATCH (match+sofar)
 #define MATCH (match+sofar)
 #define PERMATCH (match+saved+sofar)
 #define PERMATCH (match+saved+sofar)
 
 
-int wild_match_per(register char *m, register char *n)
+int _wild_match_per(register unsigned char *m, register unsigned char *n)
 {
 {
   /* null strings should never match */
   /* null strings should never match */
   if ((m == 0) || (n == 0) || (!*n))
   if ((m == 0) || (n == 0) || (!*n))
     return NOMATCH;
     return NOMATCH;
 
 
-  char *ma = m, *lsm = NULL, *lsn = NULL, *lpm = NULL, *lpn = NULL;
+  unsigned char *ma = m, *lsm = NULL, *lsn = NULL, *lpm = NULL, *lpn = NULL;
   int match = 1, saved = 0, space;
   int match = 1, saved = 0, space;
   register int sofar = 0;
   register int sofar = 0;
 
 
@@ -130,15 +130,15 @@ int wild_match_per(register char *m, register char *n)
   return (*m) ? NOMATCH : PERMATCH;     /* End of both = match */
   return (*m) ? NOMATCH : PERMATCH;     /* End of both = match */
 }
 }
 
 
-int wild_match(register char *m, register char *n)
+int _wild_match(register unsigned char *m, register unsigned char *n)
 {
 {
-  char *ma = m, *na = n;
+  unsigned char *ma = m, *na = n;
 
 
   /* null strings should never match */
   /* null strings should never match */
   if ((ma == 0) || (na == 0) || (!*ma) || (!*na))
   if ((ma == 0) || (na == 0) || (!*ma) || (!*na))
     return NOMATCH;
     return NOMATCH;
 
 
-  char *lsm = NULL, *lsn = NULL;
+  unsigned char *lsm = NULL, *lsn = NULL;
   int match = 1;
   int match = 1;
   register int sofar = 0;
   register int sofar = 0;
 
 

+ 8 - 2
src/match.h

@@ -5,7 +5,13 @@ int wild_match(register unsigned char *, register unsigned char *);
 int wild_match_per(register unsigned char *, register unsigned char *);
 int wild_match_per(register unsigned char *, register unsigned char *);
 */
 */
 
 
-int wild_match(register char *, register char *);
-int wild_match_per(register char *, register char *);
+#define wild_match(a,b) _wild_match((unsigned char *)(a),(unsigned char *)(b))
+#define wild_match_per(a,b) _wild_match_per((unsigned char *)(a),(unsigned char *)(b))
+
+int _wild_match(register unsigned char *, register unsigned char *);
+int _wild_match_per(register unsigned char *, register unsigned char *);
+
+//int wild_match(register char *, register char *);
+//int wild_match_per(register char *, register char *);
 
 
 #endif /* !_MATCH_H */
 #endif /* !_MATCH_H */