Fixed several prototypes.. Most changes are f() to f(void).

[idzebra-moved-to-github.git] / index / reckeys.c

diff --git a/index/reckeys.c b/index/reckeys.c
index 067de6b..01bf317 100644 (file)
--- a/index/reckeys.c
+++ b/index/reckeys.c
@@ -1,5 +1,5 @@
-/* $Id: reckeys.c,v 1.4 2006-05-10 08:13:22 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: reckeys.c,v 1.8 2006-10-29 17:20:01 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ 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 <stdio.h>
@@ -53,12 +53,16 @@ struct zebra_rec_keys_t_ {
 
 struct zebra_rec_key_entry **zebra_rec_keys_mk_hash(zebra_rec_keys_t p,
                                                    const char *buf,
-                                                   size_t len)
+                                                   size_t len,
+                                                    const struct it_key *key)
 {
     unsigned h = 0;
     size_t i;
+    int j;
     for (i = 0; i<len; i++)
        h = h * 65509 + buf[i];
+    for (j = 0; j<key->len; j++)
+       h = h * 65509 + CAST_ZINT_TO_INT(key->mem[j]);
     return &p->entries[h % (unsigned) p->hash_size];
 }
 
@@ -75,7 +79,7 @@ static void init_hash(zebra_rec_keys_t p)
     }
 }
 
-zebra_rec_keys_t zebra_rec_keys_open()
+zebra_rec_keys_t zebra_rec_keys_open(void)
 {
     zebra_rec_keys_t p = xmalloc(sizeof(*p));
     p->buf_used = 0;
@@ -87,7 +91,7 @@ zebra_rec_keys_t zebra_rec_keys_open()
     p->decode_handle = iscz1_start(); 
 
     p->nmem = nmem_create();
-    p->hash_size = 127;
+    p->hash_size = 1023;
     p->entries = 0;
 
     init_hash(p);
@@ -148,7 +152,8 @@ int zebra_rec_keys_add_hash(zebra_rec_keys_t keys,
                            const char *str, size_t slen,
                            const struct it_key *key)
 {
-    struct zebra_rec_key_entry **kep = zebra_rec_keys_mk_hash(keys, str, slen);
+    struct zebra_rec_key_entry **kep = zebra_rec_keys_mk_hash(keys,
+                                                              str, slen, key);
     while (*kep)
     {
        struct zebra_rec_key_entry *e = *kep;