X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcommit.c;h=9fda156de0263a9b184b9bb435bde9fb30070108;hb=3946190aece0417a4ad4e40946dfcb9f1bca4755;hp=83d54a9db5098b04a80b2bf84a769897cede8337;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git

diff --git a/bfile/commit.c b/bfile/commit.c
index 83d54a9..9fda156 100644
--- a/bfile/commit.c
+++ b/bfile/commit.c
@@ -1,6 +1,6 @@
-/* $Id: commit.c,v 1.21 2004-11-19 10:26:53 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: commit.c,v 1.29 2006-10-09 22:10:00 adam Exp $
+   Copyright (C) 1995-2006
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -15,36 +15,22 @@ 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
 
+*/
 
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include <zebrautl.h>
-#include <mfile.h>
+#include <idzebra/util.h>
+#include <yaz/xmalloc.h>
+#include "mfile.h"
 #include "cfile.h"
 
 #define CF_OPTIMIZE_COMMIT 0
 
-void cf_unlink (CFile cf)
-{
-    if (cf->bucket_in_memory)
-    {
-        yaz_log (YLOG_FATAL, "Cannot unlink potential dirty cache");
-        exit (1);
-    }
-    cf->head.state = 0;
-    cf->dirty = 1;
-    mf_unlink (cf->block_mf);
-    mf_unlink (cf->hash_mf);
-}
-
-
 #if CF_OPTIMIZE_COMMIT
 struct map_cache_entity {
     int from;
@@ -248,3 +234,11 @@ void cf_commit (CFile cf)
         cf_commit_flat (cf);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+