X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=include%2Fmfile.h;h=81fd99e0c27ec15c1318e52dbfa59b63e934e203;hp=c4a67e885bbf50ddc4714070c0bad1f7d0fb6264;hb=2b1851bd5565e3d21f9cf9a37661a584c063b75f;hpb=45a6ad99e5210bc4ef39bf00d81aee8f0fb26168

diff --git a/include/mfile.h b/include/mfile.h
index c4a67e8..81fd99e 100644
--- a/include/mfile.h
+++ b/include/mfile.h
@@ -3,33 +3,41 @@
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: mfile.h,v 1.12 1999-12-08 15:03:11 adam Exp $
+ * $Id: mfile.h,v 1.17 2002-04-04 14:14:13 adam Exp $
  */
 
 #ifndef MFILE_H
 #define MFILE_H
 
 #include <stdio.h>
+#include <yaz/yconfig.h>
+
+#ifdef WIN32
+typedef long off_t;
+#else
+#include <sys/types.h>
+#endif
 
 #ifndef FILENAME_MAX
 #include <sys/param.h>
 #define FILENAME_MAX MAXPATHLEN
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <zebra-lock.h>
+
+YAZ_BEGIN_CDECL
 
 #define MF_MIN_BLOCKS_CREAT 1          /* minimum free blocks in new dir */
 #define MF_MAX_PARTS 28                 /* max # of part-files per metafile */
 
 #define mf_blocksize(mf) ((mf)->blocksize)
 
+
 typedef struct mf_dir
 {
     char name[FILENAME_MAX+1];
-    int max_bytes;      /* allocated bytes in this dir. */
-    int avail_bytes;    /* bytes left */
+    off_t max_bytes;      /* allocated bytes in this dir. */
+    off_t avail_bytes;    /* bytes left */
     struct mf_dir *next;
 } mf_dir;
 
@@ -38,7 +46,7 @@ typedef struct part_file
     int number;
     int top;
     int blocks;
-    int bytes;
+    off_t bytes;
     mf_dir *dir;
     char *path;
     int fd;
@@ -54,10 +62,11 @@ typedef struct meta_file
     int no_files;
     int cur_file;
     int open;                          /* is this file open? */
-    int blocksize;
-    int min_bytes_creat;  /* minimum bytes required to enter directory */
+    off_t blocksize;
+    off_t min_bytes_creat;  /* minimum bytes required to enter directory */
     MFile_area ma;
     int wr;
+    Zebra_mutex mutex;
 
     struct meta_file *next;
 } *MFile, meta_file;
@@ -68,12 +77,13 @@ typedef struct MFile_area_struct
     mf_dir *dirs;
     struct meta_file *mfiles;
     struct MFile_area_struct *next;  /* global list of active areas */
+    Zebra_mutex mutex;
 } MFile_area_struct;
 
 /*
  * Open an area, cotaining metafiles in directories.
  */
-MFile_area mf_init(const char *name, const char *spec); 
+MFile_area mf_init(const char *name, const char *spec, const char *base); 
 
 /*
  * Release an area.
@@ -115,8 +125,7 @@ void mf_reset(MFile_area ma);
  * Unlink the file by name, rather than MFile-handle.
  */
 int mf_unlink_name(MFile_area, const char *name);
-#ifdef __cplusplus
-}
-#endif
+
+YAZ_END_CDECL
 
 #endif