X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Flookupec.c;h=94794e1663e634c76016143bdcd7eb7137cd0d60;hp=0d805843273c1f92046ad289ca397c92363609c9;hb=e2e073b5c947e996304ed7d577497af5e9a879ee;hpb=6a0f9234f945bc4956e2bcef75f715661a9eba9a diff --git a/dict/lookupec.c b/dict/lookupec.c index 0d80584..94794e1 100644 --- a/dict/lookupec.c +++ b/dict/lookupec.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2009 Index Data + Copyright (C) Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -17,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -44,10 +47,10 @@ static int lookup_ec(Dict dict, Dict_ptr ptr, char *info; MatchWord match_mask = 1<<(mi->m-1); - dict_bf_readp (dict->dbf, ptr, &p); + dict_bf_readp(dict->dbf, ptr, &p); lo = 0; hi = DICT_nodir(p)-1; - indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); + indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); while (lo <= hi) { if (indxp[-lo] > 0) @@ -93,9 +96,9 @@ static int lookup_ec(Dict dict, Dict_ptr ptr, /* unsigned char length of information */ /* char * information */ info = (char*)p - indxp[-lo]; - memcpy (&ch, info+sizeof(Dict_ptr), sizeof(Dict_char)); + memcpy(&ch, info+sizeof(Dict_ptr), sizeof(Dict_char)); prefix[pos] = ch; - + sc = mi->s[ch & 255]; ri[1+range] = SH(ri[0]) & sc; for (i=1; i<=range; i++) @@ -117,7 +120,7 @@ static int lookup_ec(Dict dict, Dict_ptr ptr, lookup_ec(dict, subptr, mi, ri, pos+1, userfunc, range, prefix); dict_bf_readp(dict->dbf, ptr, &p); - indxp = (short*) ((char*) p + + indxp = (short*) ((char*) p + DICT_bsize(p)-sizeof(short)); } } @@ -134,7 +137,7 @@ static MatchInfo *prepare_match(Dict_char *pattern) MatchInfo *mi; mi = (MatchInfo *) xmalloc(sizeof(*mi)); - mi->m = dict_strlen (pattern); + mi->m = dict_strlen(pattern); mi->s = s = (MatchWord *) xmalloc(sizeof(*s)*256); /* 256 !!! */ for (i = 0; i < 256; i++) s[i] = 0; @@ -153,14 +156,14 @@ int dict_lookup_ec(Dict dict, char *pattern, int range, if (!dict->head.root) return 0; - + mi = prepare_match((Dict_char*) pattern); - + ri = (MatchWord *) xmalloc((dict_strlen((Dict_char*) pattern)+range+2) * (range+1)*sizeof(*ri)); for (i = 0; i <= range; i++) ri[i] = (2<head.root, mi, ri, 0, userfunc, range, prefix); xfree(ri);