X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fmfile.h;h=7c0ab1fc72763b81ee62c54e0860fb9b972fcd25;hb=7c3a0352f0492609a3b6b26b63a72b0b2d207aab;hp=2cb6f8354f1ae211eaaefdf629d5e82209261210;hpb=b5cc5d024ac6286a0f2ab984cb8ef7995fc8a33e;p=idzebra-moved-to-github.git diff --git a/include/mfile.h b/include/mfile.h index 2cb6f83..7c0ab1f 100644 --- a/include/mfile.h +++ b/include/mfile.h @@ -1,5 +1,5 @@ -/* $Id: mfile.h,v 1.19 2003-02-28 15:28:36 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,16 +27,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +#include #ifdef WIN32 -/* 32-bit access .. */ -#if 0 -typedef long mfile_off_t; -#define mfile_seek lseek -#endif - -/* 64-but access .. */ +/* 64-bit access .. */ typedef __int64 mfile_off_t; #define mfile_seek _lseeki64 @@ -71,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; @@ -90,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; @@ -131,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.