X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Flookupec.c;h=24f4e004d7fe6aa31997dee7cdc30e9e0c22d57a;hp=5791ffad426ed5258ff6d406876c07fcb90e909b;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e

diff --git a/dict/lookupec.c b/dict/lookupec.c
index 5791ffa..24f4e00 100644
--- a/dict/lookupec.c
+++ b/dict/lookupec.c
@@ -1,8 +1,5 @@
-/* $Id: lookupec.c,v 1.13 2006-05-10 08:13:18 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2010 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
@@ -15,11 +12,10 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
-*/
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+*/
 
 #include <stdlib.h>
 #include <string.h>
@@ -37,9 +33,10 @@ typedef struct {
 
 #define SH(x) (((x)<<1)+1)
 
-int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
-                  int pos, int (*userfunc)(char *), int range,
-                  Dict_char *prefix)
+static int lookup_ec(Dict dict, Dict_ptr ptr,
+                     MatchInfo *mi, MatchWord *ri_base,
+                     int pos, int (*userfunc)(char *), int range,
+                     Dict_char *prefix)
 {
     int lo, hi;
     void *p;
@@ -47,7 +44,7 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
     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));    
@@ -65,7 +62,7 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
             {
                 Dict_char ch;
 
-                memcpy (&ch, info+j*sizeof(Dict_char), sizeof(Dict_char));
+                memcpy(&ch, info+j*sizeof(Dict_char), sizeof(Dict_char));
                 prefix[pos+j] = ch;
                 if (ch == DICT_EOS)
                 {
@@ -96,7 +93,7 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
             /* 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];
@@ -114,12 +111,12 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
                     prefix[pos+1] = DICT_EOS;
                     (*userfunc)((char*) prefix);
                 }
-                memcpy (&subptr, info, sizeof(Dict_ptr));
+                memcpy(&subptr, info, sizeof(Dict_ptr));
                 if (subptr)
                 {
-                    dict_look_ec (dict, subptr, mi, ri, pos+1,
-                                  userfunc, range, prefix);
-                    dict_bf_readp (dict->dbf, ptr, &p);
+                    lookup_ec(dict, subptr, mi, ri, pos+1,
+                              userfunc, range, prefix);
+                    dict_bf_readp(dict->dbf, ptr, &p);
                     indxp = (short*) ((char*) p + 
                                       DICT_bsize(p)-sizeof(short));
                 }
@@ -130,49 +127,50 @@ int dict_look_ec (Dict dict, Dict_ptr ptr, MatchInfo *mi, MatchWord *ri_base,
     return 0;
 }
 
-static MatchInfo *prepare_match (Dict_char *pattern)
+static MatchInfo *prepare_match(Dict_char *pattern)
 {
     int i;
     MatchWord *s;
     MatchInfo *mi;
 
-    mi = (MatchInfo *) xmalloc (sizeof(*mi));
-    mi->m = dict_strlen (pattern);
-    mi->s = s = (MatchWord *) xmalloc (sizeof(*s)*256);  /* 256 !!! */
-    for (i=0; i<256; i++)
+    mi = (MatchInfo *) xmalloc(sizeof(*mi));
+    mi->m = dict_strlen(pattern);
+    mi->s = s = (MatchWord *) xmalloc(sizeof(*s)*256);  /* 256 !!! */
+    for (i = 0; i < 256; i++)
         s[i] = 0;
-    for (i=0; pattern[i]; i++)
+    for (i = 0; pattern[i]; i++)
         s[pattern[i]&255] += 1<<i;
     return mi;
 }
 
-int dict_lookup_ec (Dict dict, char *pattern, int range,
-                    int (*userfunc)(char *name))
+int dict_lookup_ec(Dict dict, char *pattern, int range,
+                   int (*userfunc)(char *name))
 {
     MatchInfo *mi;
     MatchWord *ri;
-    int i;
+    int ret, i;
     Dict_char prefix[2048];
 
     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++)
+    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<<i)-1;
     
-    i = dict_look_ec (dict, dict->head.root, mi, ri, 0, userfunc,
-		      range, prefix);
-    xfree (ri);
-    return i;
+    ret = lookup_ec(dict, dict->head.root, mi, ri, 0, userfunc,
+                    range, prefix);
+    xfree(ri);
+    return ret;
 }
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab