X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fdopen.c;h=80f80e822851d4db2682a75786e2d163f3e2add4;hb=07daef4fb241a9106fb995bb87a823708babcb10;hp=d24e97c797a96dda2ab1a392f5d157e42ff9b725;hpb=f9c29149e90d3710b0d6f2d6a7a4cffcba401fe6;p=idzebra-moved-to-github.git

diff --git a/dict/dopen.c b/dict/dopen.c
index d24e97c..80f80e8 100644
--- a/dict/dopen.c
+++ b/dict/dopen.c
@@ -1,16 +1,43 @@
+/* $Id: dopen.c,v 1.12 2005-06-14 20:28:53 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
+
 #include <sys/types.h>
 #include <fcntl.h>
+#if HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <dict.h>
+#include "dict-p.h"
 
 static void common_init (Dict_BFile bf, int block_size, int cache)
 {
     int i;
 
     bf->block_size = block_size;
+    bf->compact_flag = 0;
     bf->cache = cache;
     bf->hash_size = 31;
 
@@ -20,12 +47,14 @@ static void common_init (Dict_BFile bf, int block_size, int cache)
     bf->all_data = xmalloc (block_size * cache);
 
     /* Allocate and initialize hash array (as empty) */
-    bf->hash_array = xmalloc(sizeof(*bf->hash_array) * bf->hash_size);
+    bf->hash_array = (struct Dict_file_block **)
+	xmalloc(sizeof(*bf->hash_array) * bf->hash_size);
     for (i=bf->hash_size; --i >= 0; )
         bf->hash_array[i] = NULL;
 
     /* Allocate all block descriptors in one chunk */
-    bf->all_blocks = xmalloc (sizeof(*bf->all_blocks) * cache);
+    bf->all_blocks = (struct Dict_file_block *)
+	xmalloc (sizeof(*bf->all_blocks) * cache);
 
     /* Initialize the free list */
     bf->free_list = bf->all_blocks;
@@ -43,14 +72,20 @@ static void common_init (Dict_BFile bf, int block_size, int cache)
 }
 
 
-Dict_BFile dict_bf_open (const char *name, int block_size, int cache, int rw)
+Dict_BFile dict_bf_open (BFiles bfs, const char *name, int block_size,
+			 int cache, int rw)
 {
     Dict_BFile dbf;
 
-    dbf = xmalloc (sizeof(*dbf));
-    dbf->bf = bf_open (name, block_size, rw);
+    dbf = (Dict_BFile) xmalloc (sizeof(*dbf));
+    dbf->bf = bf_open (bfs, name, block_size, rw);
     if (!dbf->bf)
         return NULL;
     common_init (dbf, block_size, cache);
     return dbf;
 }
+
+void dict_bf_compact (Dict_BFile dbf)
+{
+    dbf->compact_flag = 1;
+}