X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=ucw%2Fwildmatch.c;h=7a9aefb4e0c66965667cd2b41bd9ec28b8ec4d75;hb=c8ffd6e3b4fc8fd6437c04282c357b2dc290bbbd;hp=3df4920af1ab65d62e1087d0b6b4cc2480253a68;hpb=fa7aa6d9457616ce28f97c83eaa616d0ff276870;p=libucw.git diff --git a/ucw/wildmatch.c b/ucw/wildmatch.c index 3df4920a..7a9aefb4 100644 --- a/ucw/wildmatch.c +++ b/ucw/wildmatch.c @@ -42,13 +42,13 @@ struct wildpatt { struct nfa_state nfa[MAX_STATES]; struct dfa_state *hash[HASH_SIZE]; struct dfa_state *dfa_start; - uns nfa_states; - uns dfa_cache_counter; + uint nfa_states; + uint dfa_cache_counter; struct mempool *pool; struct dfa_state *free_states; }; -static inline unsigned +static inline uint wp_hash(u32 set) { set ^= set >> 16; @@ -59,9 +59,9 @@ wp_hash(u32 set) static struct dfa_state * wp_new_state(struct wildpatt *w, u32 set) { - unsigned h = wp_hash(set); + uint h = wp_hash(set); struct dfa_state *d; - unsigned bit; + uint bit; u32 def_set; while (d = w->hash[h]) @@ -89,7 +89,7 @@ wp_new_state(struct wildpatt *w, u32 set) } if (def_set) { - unsigned i; + uint i; def_set |= 1; for(i=0; i<256; i++) d->edge[i] |= def_set; @@ -102,7 +102,7 @@ struct wildpatt * wp_compile(const char *p, struct mempool *pool) { struct wildpatt *w; - uns i; + uint i; if (strlen(p) >= MAX_STATES) /* Too long */ return NULL;