Updated WIN32 code specific sections. Changed header.

[idzebra-moved-to-github.git] / dict / dopen.c

diff --git a/dict/dopen.c b/dict/dopen.c
index 3100088..9883be3 100644 (file)
--- a/dict/dopen.c
+++ b/dict/dopen.c
@@ -1,6 +1,29 @@
+/*
+ * Copyright (C) 1994-1999, Index Data
+ * All rights reserved.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: dopen.c,v $
+ * Revision 1.6  1999-02-02 14:50:20  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.5  1997/09/17 12:19:07  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.4  1997/09/09 13:38:01  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.3  1994/09/01 17:49:37  adam
+ * Removed stupid line. Work on insertion in dictionary. Not finished yet.
+ *
+ */
+
 #include <sys/types.h>
 #include <fcntl.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -10,6 +33,7 @@ static void common_init (Dict_BFile bf, int block_size, int cache)
 {
     int i;
 
+    bf->block_size = block_size;
     bf->cache = cache;
     bf->hash_size = 31;
 
@@ -42,12 +66,15 @@ 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->bf = bf_open (bfs, name, block_size, rw);
+    if (!dbf->bf)
+        return NULL;
     common_init (dbf, block_size, cache);
     return dbf;
 }