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

diff --git a/dict/dopen.c b/dict/dopen.c
index ecd742f..e95c59a 100644
--- a/dict/dopen.c
+++ b/dict/dopen.c
@@ -1,41 +1,38 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: dopen.c,v $
- * Revision 1.8  1999-05-26 07:49:12  adam
- * C++ compilation.
- *
- * 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.
- *
- */
+/* 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>
-#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)
+static void common_init(Dict_BFile bf, int block_size, int cache)
 {
     int i;
 
@@ -47,7 +44,7 @@ static void common_init (Dict_BFile bf, int block_size, int cache)
     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 = (struct Dict_file_block **)
@@ -57,7 +54,7 @@ static void common_init (Dict_BFile bf, int block_size, int cache)
 
     /* Allocate all block descriptors in one chunk */
     bf->all_blocks = (struct Dict_file_block *)
-	xmalloc (sizeof(*bf->all_blocks) * cache);
+	xmalloc(sizeof(*bf->all_blocks) * cache);
 
     /* Initialize the free list */
     bf->free_list = bf->all_blocks;
@@ -75,20 +72,32 @@ static void common_init (Dict_BFile bf, int block_size, int cache)
 }
 
 
-Dict_BFile dict_bf_open (BFiles bfs, 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 = (Dict_BFile) xmalloc (sizeof(*dbf));
-    dbf->bf = bf_open (bfs, 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);
+    {
+        xfree(dbf);
+        return 0;
+    }
+    common_init(dbf, block_size, cache);
     return dbf;
 }
 
-void dict_bf_compact (Dict_BFile 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
+ */
+