X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdopen.c;h=513b98e83a2c3683d512f7fe05ef9edce4f1ebf4;hp=2062ecfcd42b90b48077d21d8f9cc5a48a6bc1d8;hb=a030c87bc444608639905eca95e29f84a4f1d991;hpb=4478d785b7769691261005c98063b98a5a5971b3

diff --git a/dict/dopen.c b/dict/dopen.c
index 2062ecf..513b98e 100644
--- a/dict/dopen.c
+++ b/dict/dopen.c
@@ -1,8 +1,5 @@
-/* $Id: dopen.c,v 1.14 2006-08-14 10:40:09 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* 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
@@ -32,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #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;
 
@@ -44,7 +41,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 **)
@@ -54,7 +51,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;
@@ -72,26 +69,30 @@ 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