fix test to not spoil output with warnings

[apt.git] / apt-pkg / indexrecords.h

diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 0f933b93caa75d0f8ce7fcff19d58566428db56d..35e534c12c0da9a6e582eb9d0d8dc8a9ab1e12fb 100644 (file)
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -5,55 +5,90 @@
 #ifndef PKGLIB_INDEXRECORDS_H
 #define PKGLIB_INDEXRECORDS_H
 
 #ifndef PKGLIB_INDEXRECORDS_H
 #define PKGLIB_INDEXRECORDS_H
 

-
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/fileutl.h>

 #include <apt-pkg/hashes.h>
 
 #include <map>
 #include <vector>
 #include <ctime>
 #include <apt-pkg/hashes.h>
 
 #include <map>
 #include <vector>
 #include <ctime>

+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#endif
+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/pkgcache.h>
+#endif

 
 class indexRecords
 {
 
 class indexRecords
 {

-   bool parseSumData(const char *&Start, const char *End, string &Name,
-                    string &Hash, unsigned long long &Size);
+   APT_HIDDEN bool parseSumData(const char *&Start, const char *End, std::string &Name,
+                    std::string &Hash, unsigned long long &Size);

    public:
    struct checkSum;
    public:
    struct checkSum;

-   string ErrorText;
-   
+   std::string ErrorText;
+
+   private:
+   enum APT_HIDDEN { ALWAYS_TRUSTED, NEVER_TRUSTED, CHECK_TRUST } Trusted;
+   // dpointer (for later)
+   void * d;
+

    protected:
    protected:

-   string Dist;
-   string Suite;
-   string ExpectedDist;
+   std::string Dist;
+   std::string Suite;
+   std::string ExpectedDist;

    time_t ValidUntil;
    time_t ValidUntil;

+   bool SupportsAcquireByHash;

 
 

-   std::map<string,checkSum *> Entries;
+   std::map<std::string,checkSum *> Entries;

 
    public:
 
    public:

-
+#if APT_PKG_ABI >= 413
+   indexRecords(const std::string &ExpectedDist = "");
+#else

    indexRecords();
    indexRecords();

-   indexRecords(const string ExpectedDist);
+   indexRecords(const std::string ExpectedDist);
+#endif

 
    // Lookup function
 
    // Lookup function

-   virtual const checkSum *Lookup(const string MetaKey);
+   virtual checkSum *Lookup(const std::string MetaKey);

    /** \brief tests if a checksum for this file is available */
    /** \brief tests if a checksum for this file is available */

-   bool Exists(string const &MetaKey) const;
+   bool Exists(std::string const &MetaKey) const;

    std::vector<std::string> MetaKeys();
 
    std::vector<std::string> MetaKeys();
 

-   virtual bool Load(string Filename);
-   string GetDist() const;
+   virtual bool Load(std::string Filename);
+   virtual bool CheckDist(const std::string MaybeDist) const;
+
+   std::string GetDist() const;
+   std::string GetSuite() const;
+   bool GetSupportsAcquireByHash() const;

    time_t GetValidUntil() const;
    time_t GetValidUntil() const;

-   virtual bool CheckDist(const string MaybeDist) const;
-   string GetExpectedDist() const;
-   virtual ~indexRecords(){};
+   std::string GetExpectedDist() const;
+
+   /** \brief check if source is marked as always trusted */
+   bool IsAlwaysTrusted() const;
+   /** \brief check if source is marked as never trusted */
+   bool IsNeverTrusted() const;
+
+   /** \brief sets an explicit trust value
+    *
+    * \b true means that the source should always be considered trusted,
+    * while \b false marks a source as always untrusted, even if we have
+    * a valid signature and everything.
+    */
+   void SetTrusted(bool const Trusted);
+
+   virtual ~indexRecords();

 };
 
 };
 

+APT_IGNORE_DEPRECATED_PUSH

 struct indexRecords::checkSum
 {
 struct indexRecords::checkSum
 {

-   string MetaKeyFilename;
-   HashString Hash;
+   std::string MetaKeyFilename;
+   HashStringList Hashes;

    unsigned long long Size;
    unsigned long long Size;

+
+   APT_DEPRECATED HashString Hash;

 };
 };

+APT_IGNORE_DEPRECATED_POP

 
 #endif
 
 #endif