X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdopen.c;h=e95c59ab660401452a6a3f58d061502c6f5f0bb4;hp=31000887919a22f1dc0fbd0f5f24f82b3f296394;hb=a5c8c78e8671af863fc61b2ad8b24f92f827f7b2;hpb=df82693c96b0691db2508139dea6fc4a03766193

diff --git a/dict/dopen.c b/dict/dopen.c
index 3100088..e95c59a 100644
--- a/dict/dopen.c
+++ b/dict/dopen.c
@@ -1,30 +1,60 @@
+/* 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
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #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)
+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;
 
     bf->hits = bf->misses = 0;
 
     /* Allocate all blocks in one chunk. */
-    bf->all_data = xmalloc (block_size * 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;
@@ -42,12 +72,32 @@ 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);
-    common_init (dbf, block_size, cache);
+    
+    dbf = (Dict_BFile) xmalloc(sizeof(*dbf));
+    dbf->bf = bf_open(bfs, name, block_size, rw);
+    if (!dbf->bf)
+    {
+        xfree(dbf);
+        return 0;
+    }
+    common_init(dbf, block_size, cache);
     return dbf;
 }
+
+void dict_bf_compact(Dict_BFile dbf)
+{
+    dbf->compact_flag = 1;
+}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+