X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=bfile%2Fbfile.c;h=41b8a62a8a180c6420d3b9d17038239eb5adeb39;hb=8f261393d79c2d7b7bf5fb81a4288c45481f72f7;hp=3ba061e17a1be4250b5934e5d658ecc1b26258c0;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git diff --git a/bfile/bfile.c b/bfile/bfile.c index 3ba061e..41b8a62 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,6 +1,6 @@ -/* $Id: bfile.c,v 1.37 2004-11-19 10:26:53 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps +/* $Id: bfile.c,v 1.39 2005-01-15 19:38:17 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -20,8 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - - #include #include #include @@ -33,10 +31,17 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include -#include - +#include +#include "mfile.h" #include "cfile.h" +struct BFile_struct +{ + MFile mf; + Zebra_lock_rdwr rdwr_lock; + struct CFile_struct *cf; +}; + struct BFiles_struct { MFile_area commit_area; MFile_area_struct *register_area; @@ -117,7 +122,7 @@ int bf_close (BFile bf) BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag) { - BFile tmp = (BFile) xmalloc(sizeof(BFile_struct)); + BFile tmp = (BFile) xmalloc(sizeof(struct BFile_struct)); if (bfs->commit_area) {