X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdopen.c;h=b2585c4cc8d4e56cffeddc326b5ac076a2062426;hp=981d2b96b78a69fed5c8fea00a3d5c7625ddaed5;hb=0dedb6a7a6a0f0ddaf56cb0673978fdd85e64be1;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197 diff --git a/dict/dopen.c b/dict/dopen.c index 981d2b9..b2585c4 100644 --- a/dict/dopen.c +++ b/dict/dopen.c @@ -1,8 +1,5 @@ -/* $Id: dopen.c,v 1.16 2007-01-15 15:10:15 adam Exp $ - Copyright (C) 1995-2007 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 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 @@ -22,6 +19,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#if HAVE_CONFIG_H +#include +#endif #include #include #if HAVE_UNISTD_H @@ -32,7 +32,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 +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 **) @@ -54,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; @@ -72,29 +72,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) { xfree(dbf); return 0; } - common_init (dbf, block_size, cache); + 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