X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fcfile.h;h=9f03dc1a37ef1c5bad0ec6ff9a8aa1ec66f7981e;hb=0f563f23506dabd7c84bdb750d4539b2b6cacf02;hp=0f22c29f5a8d39a0cdb3ffe6adb2e578c037065f;hpb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;p=idzebra-moved-to-github.git

diff --git a/bfile/cfile.h b/bfile/cfile.h
index 0f22c29..9f03dc1 100644
--- a/bfile/cfile.h
+++ b/bfile/cfile.h
@@ -1,25 +1,41 @@
-/*
- * Copyright (C) 1995-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: cfile.h,v 1.12 1999-05-26 07:49:12 adam Exp $
- */
+/* $Id: cfile.h,v 1.22 2007-01-15 20:08:23 adam Exp $
+   Copyright (C) 1995-2007
+   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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
 
 #ifndef CFILE_H
 #define CFILE_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <yaz/yconfig.h>
+
+YAZ_BEGIN_CDECL
 
 #define HASH_BUCKET 15
 
 struct CFile_ph_bucket {     /* structure on disc */
-    int no[HASH_BUCKET];     /* block number in original file */
-    int vno[HASH_BUCKET];    /* block number in shadow file */
-    int this_bucket;         /* this bucket number */
-    int next_bucket;         /* next bucket number */
+    zint no[HASH_BUCKET];    /* block number in original file */
+    zint vno[HASH_BUCKET];   /* block number in shadow file */
+    zint this_bucket;        /* this bucket number */
+    zint next_bucket;        /* next bucket number */
 };
 
 struct CFile_hash_bucket {
@@ -37,37 +53,43 @@ typedef struct CFile_struct
 {
     struct CFile_head {
         int state;               /* 1 = hash, 2 = flat */
-        int next_block;          /* next free block / last block */
+        zint next_block;          /* next free block / last block */
         int block_size;          /* mfile/bfile block size */
         int hash_size;           /* no of chains in hash table */
-        int first_bucket;        /* first hash bucket */
-        int next_bucket;         /* last hash bucket + 1 = first flat bucket */
-        int flat_bucket;         /* last flat bucket + 1 */
+        zint first_bucket;       /* first hash bucket */
+        zint next_bucket;        /* last hash bucket + 1 = first flat bucket */
+        zint flat_bucket;        /* last flat bucket + 1 */
     } head;
     MFile block_mf;
     MFile hash_mf;
-    int *array;
+    zint *array;
     struct CFile_hash_bucket **parray;
     struct CFile_hash_bucket *bucket_lru_front, *bucket_lru_back;
     int dirty;
-    int bucket_in_memory;
-    int max_bucket_in_memory;
+    zint bucket_in_memory;
+    zint max_bucket_in_memory;
     char *iobuf;
     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 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);
+int cf_read (CFile cf, zint no, int offset, int nbytes, void *buf);
+int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf);
+int cf_commit (CFile cf) ZEBRA_GCC_ATTR((warn_unused_result));
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+