summaryrefslogtreecommitdiff
path: root/apt-pkg/indexrecords.h
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 16:32:52 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-11-10 16:32:52 +0100
commit71ecaad29d8066a494f516efc5efd80860653fe2 (patch)
treeb0769df88e2b6496f23e3d899aeb1c240a3488d9 /apt-pkg/indexrecords.h
parenta865ed25fa54514224cf4d6f83dd9cf48b7ed02b (diff)
parent37adedc9d0b66eeae7efb88aebd08dfbc6e06f77 (diff)
merged from http://bzr.debian.org/bzr/apt/apt/debian-experimental2
Diffstat (limited to 'apt-pkg/indexrecords.h')
-rw-r--r--apt-pkg/indexrecords.h33
1 files changed, 16 insertions, 17 deletions
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 5b532c1a5..fa60a0847 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -7,7 +7,6 @@
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/fileutl.h>
#include <apt-pkg/hashes.h>
#include <map>
@@ -16,44 +15,44 @@
class indexRecords
{
- bool parseSumData(const char *&Start, const char *End, string &Name,
- string &Hash, size_t &Size);
+ bool parseSumData(const char *&Start, const char *End, std::string &Name,
+ std::string &Hash, unsigned long long &Size);
public:
struct checkSum;
- string ErrorText;
+ std::string ErrorText;
protected:
- string Dist;
- string Suite;
- string ExpectedDist;
+ std::string Dist;
+ std::string Suite;
+ std::string ExpectedDist;
time_t ValidUntil;
- std::map<string,checkSum *> Entries;
+ std::map<std::string,checkSum *> Entries;
public:
indexRecords();
- indexRecords(const string ExpectedDist);
+ indexRecords(const std::string ExpectedDist);
// Lookup function
- virtual const checkSum *Lookup(const string MetaKey);
+ virtual const checkSum *Lookup(const std::string MetaKey);
/** \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();
- virtual bool Load(string Filename);
- string GetDist() const;
+ virtual bool Load(std::string Filename);
+ std::string GetDist() const;
time_t GetValidUntil() const;
- virtual bool CheckDist(const string MaybeDist) const;
- string GetExpectedDist() const;
+ virtual bool CheckDist(const std::string MaybeDist) const;
+ std::string GetExpectedDist() const;
virtual ~indexRecords(){};
};
struct indexRecords::checkSum
{
- string MetaKeyFilename;
+ std::string MetaKeyFilename;
HashString Hash;
- size_t Size;
+ unsigned long long Size;
};
#endif