X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fdopen.c;h=5d72410f8e8013d25c3842d84daa50329d1a2b68;hb=6a0f9234f945bc4956e2bcef75f715661a9eba9a;hp=89b70851b54a603e51232e1352634a56eb351cae;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git diff --git a/dict/dopen.c b/dict/dopen.c index 89b7085..5d72410 100644 --- a/dict/dopen.c +++ b/dict/dopen.c @@ -1,8 +1,5 @@ -/* $Id: dopen.c,v 1.13 2006-05-10 08:13:18 adam Exp $ - Copyright (C) 1995-2005 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2009 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 @@ -15,9 +12,9 @@ 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. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ @@ -80,7 +77,10 @@ Dict_BFile dict_bf_open (BFiles bfs, const char *name, int block_size, dbf = (Dict_BFile) xmalloc (sizeof(*dbf)); dbf->bf = bf_open (bfs, name, block_size, rw); if (!dbf->bf) - return NULL; + { + xfree(dbf); + return 0; + } common_init (dbf, block_size, cache); return dbf; } @@ -92,6 +92,7 @@ void dict_bf_compact (Dict_BFile dbf) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab