use a format string in ListSingleVersion

[apt.git] / ftparchive / writer.h

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 3796f79f6de18b9f8ed8da3d9ef88ed984c7b29d..d8a10e0bbc578376139842bb63cdd48579bbc5cc 100644 (file)
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -13,16 +13,17 @@
 #ifndef WRITER_H
 #define WRITER_H
 
 #ifndef WRITER_H
 #define WRITER_H
 

-

 #include <string>
 #include <stdio.h>
 #include <iostream>
 #include <vector>
 #include <map>
 #include <set>
 #include <string>
 #include <stdio.h>
 #include <iostream>
 #include <vector>
 #include <map>
 #include <set>

+#include <stdlib.h>
+#include <sys/types.h>

 
 

+#include "contents.h"

 #include "cachedb.h"
 #include "cachedb.h"

-#include "multicompress.h"

 #include "override.h"
 #include "apt-ftparchive.h"
 
 #include "override.h"
 #include "apt-ftparchive.h"
 


@@ -31,7 +32,7 @@ using std::cout;
 using std::endl;
 using std::vector;
 using std::map;
 using std::endl;
 using std::vector;
 using std::map;

-    
+

 class FTWScanner
 {
    protected:
 class FTWScanner
 {
    protected:


@@ -48,7 +49,7 @@ class FTWScanner
    static int ScannerFile(const char *File, bool const &ReadLink);
 
    bool Delink(string &FileName,const char *OriginalPath,
    static int ScannerFile(const char *File, bool const &ReadLink);
 
    bool Delink(string &FileName,const char *OriginalPath,

-              unsigned long &Bytes,off_t const &FileSize);
+              unsigned long long &Bytes,unsigned long long const &FileSize);

 
    inline void NewLine(unsigned const &Priority)
    {
 
    inline void NewLine(unsigned const &Priority)
    {


@@ -60,6 +61,10 @@ class FTWScanner
    }
    
    public:
    }
    
    public:

+   bool DoMD5;
+   bool DoSHA1;
+   bool DoSHA256;
+   bool DoSHA512;

 
    unsigned long DeLinkLimit;
    string InternalPrefix;
 
    unsigned long DeLinkLimit;
    string InternalPrefix;


@@ -77,6 +82,8 @@ class FTWScanner
    virtual ~FTWScanner() {};
 };
 
    virtual ~FTWScanner() {};
 };
 

+class MultiCompress;
+

 class TranslationWriter
 {
    MultiCompress *Comp;
 class TranslationWriter
 {
    MultiCompress *Comp;


@@ -103,9 +110,6 @@ class PackagesWriter : public FTWScanner
    public:
 
    // Some flags
    public:
 
    // Some flags

-   bool DoMD5;
-   bool DoSHA1;
-   bool DoSHA256;

    bool DoAlwaysStat;
    bool NoOverride;
    bool DoContents;
    bool DoAlwaysStat;
    bool NoOverride;
    bool DoContents;


@@ -123,8 +127,10 @@ class PackagesWriter : public FTWScanner
       {return Over.ReadExtraOverride(File);};
    virtual bool DoPackage(string FileName);
 
       {return Over.ReadExtraOverride(File);};
    virtual bool DoPackage(string FileName);
 

-   PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides=string(),
-                 string const &Arch=string());
+   PackagesWriter(string const &DB,
+                  string const &Overrides,
+                  string const &ExtOverrides = "",
+                 string const &Arch = "");

    virtual ~PackagesWriter() {};
 };
 
    virtual ~PackagesWriter() {};
 };
 


@@ -155,24 +161,26 @@ class ContentsWriter : public FTWScanner
 
 class SourcesWriter : public FTWScanner
 {
 
 class SourcesWriter : public FTWScanner
 {

+   CacheDB Db;

    Override BOver;
    Override SOver;
    char *Buffer;
    Override BOver;
    Override SOver;
    char *Buffer;

-   unsigned long BufSize;
+   unsigned long long BufSize;

    
    public:
 
    bool NoOverride;
    
    public:
 
    bool NoOverride;

+   bool DoAlwaysStat;

    
    // General options
    string PathPrefix;
    string DirStrip;
    FILE *Output;
    
    // General options
    string PathPrefix;
    string DirStrip;
    FILE *Output;

-   struct CacheDB::Stats Stats;
+   struct CacheDB::Stats &Stats;

 
    virtual bool DoPackage(string FileName);
 
 
    virtual bool DoPackage(string FileName);
 

-   SourcesWriter(string const &BOverrides,string const &SOverrides,
+   SourcesWriter(string const &DB,string const &BOverrides,string const &SOverrides,

                 string const &ExtOverrides=string());
    virtual ~SourcesWriter() {free(Buffer);};
 };
                 string const &ExtOverrides=string());
    virtual ~SourcesWriter() {free(Buffer);};
 };


@@ -195,8 +203,9 @@ protected:
       string MD5;
       string SHA1;
       string SHA256;
       string MD5;
       string SHA1;
       string SHA256;

+      string SHA512;

       // Limited by FileFd::Size()
       // Limited by FileFd::Size()

-      unsigned long size;
+      unsigned long long size;

       ~CheckSum() {};
    };
    map<string,struct CheckSum> CheckSums;
       ~CheckSum() {};
    };
    map<string,struct CheckSum> CheckSums;