X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fwildmatch.c;h=e0b5e2ecf6fd0ef42848b6609b737a9359d46d77;hb=ed4e86de76d1c3bfb685207fe00078950f67355a;hp=5fcef8220f09e1d4ca6570531421bdaa89a33e97;hpb=e9aa499507f33db9fac50f3864609a6b292685e0;p=libucw.git

diff --git a/lib/wildmatch.c b/lib/wildmatch.c
index 5fcef822..e0b5e2ec 100644
--- a/lib/wildmatch.c
+++ b/lib/wildmatch.c
@@ -1,13 +1,16 @@
 /*
- *	Fast Pattern Matcher for Short Wildcard Patterns (only `?' and `*' supported)
+ *	UCW Library -- Fast Pattern Matcher for Short Wildcard Patterns (only `?' and `*' supported)
  *
  *	Traditional NFA -> DFA method with on-the-fly DFA construction.
  *
  *	(c) 1999 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
  */
 
 #include "lib/lib.h"
-#include "lib/pools.h"
+#include "lib/mempool.h"
 #include "lib/wildmatch.h"
 
 #include <stdio.h>
@@ -26,7 +29,7 @@ struct nfa_state {
 };
 
 struct dfa_state {
-  addr_int_t edge[256];		/* Outgoing DFA edges. Bit 0 is set for incomplete edges which
+  uintptr_t edge[256];		/* Outgoing DFA edges. Bit 0 is set for incomplete edges which
 				 * contain just state set and clear for complete ones which point
 				 * to other states. NULL means `no match'.
 				 */
@@ -96,7 +99,7 @@ wp_new_state(struct wildpatt *w, u32 set)
 }
 
 struct wildpatt *
-wp_compile(byte *p, struct mempool *pool)
+wp_compile(const byte *p, struct mempool *pool)
 {
   struct wildpatt *w;
   uns i;
@@ -145,7 +148,7 @@ wp_prune_cache(struct wildpatt *w)
 }
 
 int
-wp_match(struct wildpatt *w, byte *s)
+wp_match(struct wildpatt *w, const byte *s)
 {
   struct dfa_state *d;
 
@@ -154,12 +157,12 @@ wp_match(struct wildpatt *w, byte *s)
   d = w->dfa_start;
   while (*s)
     {
-      addr_int_t next = d->edge[*s];
+      uintptr_t next = d->edge[*s];
       if (next & 1)
 	{
 	  /* Need to lookup/create the destination state */
 	  struct dfa_state *new = wp_new_state(w, next & ~1);
-	  d->edge[*s] = (addr_int_t) new;
+	  d->edge[*s] = (uintptr_t) new;
 	  d = new;
 	}
       else if (!next)
@@ -172,7 +175,7 @@ wp_match(struct wildpatt *w, byte *s)
 }
 
 int
-wp_min_size(byte *p)
+wp_min_size(const byte *p)
 {
   int s = 0;