set the correct item FileSize in by-hash case

[apt.git] / apt-inst / dirstream.h

diff --git a/apt-inst/dirstream.h b/apt-inst/dirstream.h
index 53ac24ba5c8c5d02b8220c85edf24d6d57115269..dac965db79e93af355a50ccd78417e97949fcbb8 100644 (file)
--- a/apt-inst/dirstream.h
+++ b/apt-inst/dirstream.h
@@ -38,15 +38,10 @@ class pkgDirStream
                   Directory, FIFO} Type;
       char *Name;
       char *LinkTarget;
                   Directory, FIFO} Type;
       char *Name;
       char *LinkTarget;

-#if APT_PKG_ABI >= 413
-      unsigned long long Size;
-#endif

       unsigned long Mode;
       unsigned long UID;
       unsigned long GID;
       unsigned long Mode;
       unsigned long UID;
       unsigned long GID;

-#if APT_PKG_ABI < 413
-      unsigned long Size;
-#endif
+      unsigned long long Size;

       unsigned long MTime;
       unsigned long Major;
       unsigned long Minor;
       unsigned long MTime;
       unsigned long Major;
       unsigned long Minor;


@@ -55,13 +50,8 @@ class pkgDirStream
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Fail(Item &Itm,int Fd);
    virtual bool FinishedFile(Item &Itm,int Fd);
    virtual bool DoItem(Item &Itm,int &Fd);
    virtual bool Fail(Item &Itm,int Fd);
    virtual bool FinishedFile(Item &Itm,int Fd);

-#if APT_PKG_ABI >= 413

    virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
                        unsigned long long /*Size*/,unsigned long long /*Pos*/) {return true;};
    virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
                        unsigned long long /*Size*/,unsigned long long /*Pos*/) {return true;};

-#else
-   virtual bool Process(Item &/*Itm*/,const unsigned char * /*Data*/,
-                       unsigned long /*Size*/,unsigned long /*Pos*/) {return true;};
-#endif

    virtual ~pkgDirStream() {};   
 };
 
    virtual ~pkgDirStream() {};   
 };