Use HAVE_UNISTD_H when including unistd.h.

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

diff --git a/dict/dopen.c b/dict/dopen.c
index 0a3e63c..80f80e8 100644 (file)
--- a/dict/dopen.c
+++ b/dict/dopen.c
@@ -1,36 +1,36 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: dopen.c,v $
- * Revision 1.7  1999-05-15 14:36:37  adam
- * Updated dictionary. Implemented "compression" of dictionary.
- *
- * 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.
- *
- */
+/* $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>
-#ifndef WIN32
+#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)
 {
@@ -47,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;
@@ -75,7 +77,7 @@ Dict_BFile dict_bf_open (BFiles bfs, const char *name, int block_size,
 {
     Dict_BFile dbf;
 
-    dbf = xmalloc (sizeof(*dbf));
+    dbf = (Dict_BFile) xmalloc (sizeof(*dbf));
     dbf->bf = bf_open (bfs, name, block_size, rw);
     if (!dbf->bf)
         return NULL;