X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcfile.h;h=43d69a96ac1fb7ca7e7617f2e8231f1c0d32a978;hb=01d68c3e68001168758afc0c4ffd101a7c5cf149;hp=8006599860d4be4d15a4bb203402ce326347c649;hpb=5e1f8f38f613f6e662a189eed0879d23a29e9e26;p=idzebra-moved-to-github.git

diff --git a/bfile/cfile.h b/bfile/cfile.h
index 8006599..43d69a9 100644
--- a/bfile/cfile.h
+++ b/bfile/cfile.h
@@ -1,47 +1,34 @@
-/*
- * Copyright (C) 1995-1998, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: cfile.h,v $
- * Revision 1.10  1998-10-15 13:09:31  adam
- * Minor changes.
- *
- * Revision 1.9  1998/08/07 15:07:15  adam
- * Fixed but in cf_commit_flat.
- *
- * Revision 1.8  1996/04/18 16:02:56  adam
- * Changed logging a bit.
- * Removed warning message when commiting flat shadow files.
- *
- * Revision 1.7  1996/02/07  14:03:48  adam
- * Work on flat indexed shadow files.
- *
- * Revision 1.6  1996/02/07  10:08:45  adam
- * Work on flat shadow (not finished yet).
- *
- * Revision 1.5  1995/12/15  12:36:52  adam
- * Moved hash file information to union.
- * Renamed commit files.
- *
- * Revision 1.4  1995/12/11  09:03:54  adam
- * New function: cf_unlink.
- * New member of commit file head: state (0) deleted, (1) hash file.
- *
- * Revision 1.3  1995/12/01  16:24:29  adam
- * Commit files use separate meta file area.
- *
- * Revision 1.2  1995/12/01  11:37:23  adam
- * Cached/commit files implemented as meta-files.
- *
- * Revision 1.1  1995/11/30  08:33:12  adam
- * Started work on commit facility.
- *
- */
+/* $Id: cfile.h,v 1.14 2002-08-02 19:26:55 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
 
 #ifndef CFILE_H
 #define CFILE_H
 
+#include <yaz/yconfig.h>
+
+YAZ_BEGIN_CDECL
+
 #define HASH_BUCKET 15
 
 struct CFile_ph_bucket {     /* structure on disc */
@@ -85,14 +72,17 @@ typedef struct CFile_struct
     MFile rmf;
     int  no_hits;
     int  no_miss;
+    Zebra_mutex mutex;
 } *CFile;
 
 int cf_close (CFile cf);
 CFile cf_open (MFile mf, MFile_area area, const char *fname, int block_size,
                int wflag, int *firstp);
-int cf_read (CFile cf, int no, int offset, int num, void *buf);
-int cf_write (CFile cf, int no, int offset, int num, const void *buf);
+int cf_read (CFile cf, int no, int offset, int nbytes, void *buf);
+int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf);
 void cf_unlink (CFile cf);
 void cf_commit (CFile cf);
 
+YAZ_END_CDECL
+
 #endif