X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Flookup.c;h=99138f79a0572c9faad80dbd3e269e9ba1cdc300;hb=3dc61ce9fd0ee13d348119d4269027afe7a67479;hp=6339618d5bab5cbca66081bc1ad7a080b33accb8;hpb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;p=idzebra-moved-to-github.git diff --git a/dict/lookup.c b/dict/lookup.c index 6339618..99138f7 100644 --- a/dict/lookup.c +++ b/dict/lookup.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2009 Index Data + Copyright (C) 1994-2011 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 @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "dict-p.h" -static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr) +static char *dict_look(Dict dict, const Dict_char *str, Dict_ptr ptr) { int mid, lo, hi; int cmp; @@ -34,7 +34,7 @@ static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr) short *indxp; char *info; - dict_bf_readp (dict->dbf, ptr, &p); + dict_bf_readp(dict->dbf, ptr, &p); mid = lo = 0; hi = DICT_nodir(p)-1; indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); @@ -62,11 +62,11 @@ static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr) /* unsigned char length of information */ /* char * information */ info = (char*)p - indxp[-mid]; - memcpy (&dc, info+sizeof(Dict_ptr), sizeof(Dict_char)); + memcpy(&dc, info+sizeof(Dict_ptr), sizeof(Dict_char)); cmp = dc- *str; if (!cmp) { - memcpy (&subptr, info, sizeof(Dict_ptr)); + memcpy(&subptr, info, sizeof(Dict_ptr)); if (*++str == DICT_EOS) { if (info[sizeof(Dict_ptr)+sizeof(Dict_char)]) @@ -78,7 +78,7 @@ static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr) if (subptr == 0) return NULL; ptr = subptr; - dict_bf_readp (dict->dbf, ptr, &p); + dict_bf_readp(dict->dbf, ptr, &p); mid = lo = 0; hi = DICT_nodir(p)-1; indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short)); @@ -94,16 +94,17 @@ static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr) return NULL; } -char *dict_lookup (Dict dict, const char *p) +char *dict_lookup(Dict dict, const char *p) { dict->no_lookup++; if (!dict->head.root) return NULL; - return dict_look (dict, (const Dict_char *) p, dict->head.root); + return dict_look(dict, (const Dict_char *) p, dict->head.root); } /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab