Dsync merge

[apt.git] / apt-pkg / contrib / mmap.h

diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index 0e80c15d21b5ce18638ccb507f102ea96e773328..3cb6c646898a51c09001a2f3e4e39d7d3320c5e2 100644 (file)
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: mmap.h,v 1.4 1998/07/12 23:58:51 jgg Exp $
+// $Id: mmap.h,v 1.8 1999/01/18 06:20:08 jgg Exp $
 /* ######################################################################
    
    MMap Class - Provides 'real' mmap or a faked mmap using read().
@@ -22,7 +22,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
-// Header section: pkglib
 #ifndef PKGLIB_MMAP_H
 #define PKGLIB_MMAP_H
 
@@ -37,13 +36,13 @@ class MMap
 {
    protected:
    
-   File &Fd;
+   FileFd &Fd;
    unsigned long Flags;   
    unsigned long iSize;
    void *Base;
 
    bool Map();
-   bool Close(bool DoClose = true);
+   bool Close(bool DoClose = true,bool DoSync = true);
    
    public:
 
@@ -58,7 +57,7 @@ class MMap
    bool Sync();
    bool Sync(unsigned long Start,unsigned long Stop);
    
-   MMap(File &F,unsigned long Flags);
+   MMap(FileFd &F,unsigned long Flags);
    virtual ~MMap();
 };
 
@@ -89,7 +88,7 @@ class DynamicMMap : public MMap
    inline unsigned long WriteString(string S) {return WriteString(S.begin(),S.size());};
    void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;}; 
    
-   DynamicMMap(File &F,unsigned long Flags,unsigned long WorkSpace = 1024*1024);
+   DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 2*1024*1024);
    virtual ~DynamicMMap();
 };