projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug #4592: dict_scan misses
[idzebra-moved-to-github.git]
/
dict
/
dopen.c
diff --git
a/dict/dopen.c
b/dict/dopen.c
index
d014eb4
..
e95c59a
100644
(file)
--- a/
dict/dopen.c
+++ b/
dict/dopen.c
@@
-1,8
+1,5
@@
-/* $Id: dopen.c,v 1.10 2004-12-08 12:23:08 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- 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
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
@@
-15,16
+12,19
@@
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
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.
+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>
#include <sys/types.h>
#include <fcntl.h>
-#ifndef WIN32
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <stdio.h>
#include <unistd.h>
#endif
#include <stdio.h>
@@
-32,7
+32,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "dict-p.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;
{
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->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 **)
/* 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 *)
/* 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;
/* Initialize the free list */
bf->free_list = bf->all_blocks;
@@
-72,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;
{
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)
if (!dbf->bf)
- return NULL;
- common_init (dbf, block_size, cache);
+ {
+ xfree(dbf);
+ return 0;
+ }
+ common_init(dbf, block_size, cache);
return dbf;
}
return dbf;
}
-void dict_bf_compact (Dict_BFile dbf)
+void dict_bf_compact(Dict_BFile dbf)
{
dbf->compact_flag = 1;
}
{
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
+ */
+