X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fmfile.h;h=7c0ab1fc72763b81ee62c54e0860fb9b972fcd25;hb=7c3a0352f0492609a3b6b26b63a72b0b2d207aab;hp=3abe5dca91111ee93e8070f4a96f44c8bc0f381a;hpb=f927fab40f1e3d0d97965f7b02868516b9152ca1;p=idzebra-moved-to-github.git

diff --git a/include/mfile.h b/include/mfile.h
index 3abe5dc..7c0ab1f 100644
--- a/include/mfile.h
+++ b/include/mfile.h
@@ -1,5 +1,5 @@
-/* $Id: mfile.h,v 1.20 2003-03-21 08:02:24 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: mfile.h,v 1.23 2004-08-25 09:23:35 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -27,19 +27,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <stdio.h>
 #include <yaz/yconfig.h>
+#include <idzebra/version.h>
 
 #ifdef WIN32
 
-#if 0
-/* 32-bit access .. */
-typedef long mfile_off_t;
-#define mfile_seek lseek
-
-#else
 /* 64-bit access .. */
 typedef __int64 mfile_off_t;
 #define mfile_seek _lseeki64
-#endif
 
 #else
 #include <sys/types.h>
@@ -72,9 +66,9 @@ typedef struct mf_dir
 
 typedef struct part_file
 {
-    int number;
-    int top;
-    int blocks;
+    zint number;
+    zint top;
+    zint blocks;
     mfile_off_t bytes;
     mf_dir *dir;
     char *path;
@@ -91,6 +85,7 @@ typedef struct meta_file
     int no_files;
     int cur_file;
     int open;                          /* is this file open? */
+    int unlink_flag;
     int blocksize;
     mfile_off_t min_bytes_creat;  /* minimum bytes required to enter directory */
     MFile_area ma;
@@ -132,12 +127,12 @@ int mf_close(MFile mf);
 /*
  * Read one block from a metafile. Interface mirrors bfile.
  */
-int mf_read(MFile mf, int no, int offset, int nbytes, void *buf);
+int mf_read(MFile mf, zint no, int offset, int nbytes, void *buf);
 
 /*
  * Same.
  */
-int mf_write(MFile mf, int no, int offset, int nbytes, const void *buf);
+int mf_write(MFile mf, zint no, int offset, int nbytes, const void *buf);
 
 /*
  * Destroy a metafile, unlinking component files. File must be open.