projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove paragraph about commercial support
[idzebra-moved-to-github.git]
/
dict
/
lookup.c
diff --git
a/dict/lookup.c
b/dict/lookup.c
index
7704482
..
6a45359
100644
(file)
--- a/
dict/lookup.c
+++ b/
dict/lookup.c
@@
-1,8
+1,5
@@
-/* $Id: lookup.c,v 1.16 2006-12-12 13:42:24 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ 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
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
@@
-22,6
+19,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
@@
-29,7
+29,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "dict-p.h"
#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;
{
int mid, lo, hi;
int cmp;
@@
-37,7
+37,7
@@
static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr)
short *indxp;
char *info;
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));
mid = lo = 0;
hi = DICT_nodir(p)-1;
indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
@@
-65,11
+65,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];
/* 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)
{
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)])
if (*++str == DICT_EOS)
{
if (info[sizeof(Dict_ptr)+sizeof(Dict_char)])
@@
-81,7
+81,7
@@
static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr)
if (subptr == 0)
return NULL;
ptr = subptr;
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));
mid = lo = 0;
hi = DICT_nodir(p)-1;
indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
@@
-97,16
+97,17
@@
static char *dict_look (Dict dict, const Dict_char *str, Dict_ptr ptr)
return NULL;
}
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;
{
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
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab