summaryrefslogtreecommitdiff
path: root/apt-pkg/edsp
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2015-06-23 12:17:35 +0100
committerMichael Vogt <mvo@debian.org>2015-06-23 12:17:35 +0100
commit245dde96193702f7f51389d3583dee547f8ba366 (patch)
tree6cf8c191641c760bcc6a6c08fb0ff65d27e0cffd /apt-pkg/edsp
parent5530255b5f3ad7de2e23dfcb39ce325001126501 (diff)
parentc8a4ce6cbed57ae108dc955d4a850f9b129a0693 (diff)
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Diffstat (limited to 'apt-pkg/edsp')
-rw-r--r--apt-pkg/edsp/edspindexfile.cc11
-rw-r--r--apt-pkg/edsp/edspindexfile.h3
-rw-r--r--apt-pkg/edsp/edsplistparser.cc6
-rw-r--r--apt-pkg/edsp/edsplistparser.h8
-rw-r--r--apt-pkg/edsp/edspsystem.cc4
-rw-r--r--apt-pkg/edsp/edspsystem.h6
6 files changed, 21 insertions, 17 deletions
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index c38f24567..5d9383e94 100644
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -49,15 +49,14 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
if (Prog != NULL)
Prog->SubProgress(0,File);
- if (Gen.SelectFile(File,std::string(),*this) == false)
+ if (Gen.SelectFile(File, *this, "", "edsp") == false)
return _error->Error("Problem with SelectFile %s",File.c_str());
// Store the IMS information
pkgCache::PkgFileIterator CFile = Gen.GetCurFile();
+ pkgCacheGenerator::Dynamic<pkgCache::PkgFileIterator> DynFile(CFile);
CFile->Size = Pkg.FileSize();
CFile->mtime = Pkg.ModificationTime();
- map_stringitem_t const storage = Gen.StoreString(pkgCacheGenerator::MIXED, "edsp::scenario");
- CFile->Archive = storage;
if (Gen.MergeList(Parser) == false)
return _error->Error("Problem with MergeList %s",File.c_str());
@@ -65,7 +64,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
}
/*}}}*/
// Index File types for APT /*{{{*/
-class edspIFType: public pkgIndexFile::Type
+class APT_HIDDEN edspIFType: public pkgIndexFile::Type
{
public:
virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator) const
@@ -75,10 +74,12 @@ class edspIFType: public pkgIndexFile::Type
};
edspIFType() {Label = "EDSP scenario file";};
};
-static edspIFType _apt_Universe;
+APT_HIDDEN edspIFType _apt_Universe;
const pkgIndexFile::Type *edspIndex::GetType() const
{
return &_apt_Universe;
}
/*}}}*/
+
+edspIndex::~edspIndex() {}
diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 609a2cde4..0f63b7b2a 100644
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -18,7 +18,7 @@
class OpProgress;
class pkgCacheGenerator;
-class edspIndex : public debStatusIndex
+class APT_HIDDEN edspIndex : public debStatusIndex
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
@@ -30,6 +30,7 @@ class edspIndex : public debStatusIndex
virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
edspIndex(std::string File);
+ virtual ~edspIndex();
};
#endif
diff --git a/apt-pkg/edsp/edsplistparser.cc b/apt-pkg/edsp/edsplistparser.cc
index 212dc7840..d1c0cf7e8 100644
--- a/apt-pkg/edsp/edsplistparser.cc
+++ b/apt-pkg/edsp/edsplistparser.cc
@@ -86,9 +86,11 @@ bool edspListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
}
/*}}}*/
// ListParser::LoadReleaseInfo - Load the release information /*{{{*/
-APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::PkgFileIterator & /*FileI*/,
- FileFd & /*File*/, std::string /*component*/)
+APT_CONST bool edspListParser::LoadReleaseInfo(pkgCache::RlsFileIterator & /*FileI*/,
+ FileFd & /*File*/, std::string const &/*component*/)
{
return true;
}
/*}}}*/
+
+edspListParser::~edspListParser() {}
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index 959fb587f..ef5179e68 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -25,8 +25,9 @@
class FileFd;
-class edspListParser : public debListParser
+class APT_HIDDEN edspListParser : public debListParser
{
+ void *d;
public:
virtual bool NewVersion(pkgCache::VerIterator &Ver);
virtual std::string Description();
@@ -34,10 +35,11 @@ class edspListParser : public debListParser
virtual MD5SumValue Description_md5();
virtual unsigned short VersionHash();
- bool LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,FileFd &File,
- std::string section);
+ bool LoadReleaseInfo(pkgCache::RlsFileIterator &FileI,FileFd &File,
+ std::string const &section);
edspListParser(FileFd *File, std::string const &Arch = "");
+ virtual ~edspListParser();
protected:
virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver);
diff --git a/apt-pkg/edsp/edspsystem.cc b/apt-pkg/edsp/edspsystem.cc
index 92edb8d77..063517421 100644
--- a/apt-pkg/edsp/edspsystem.cc
+++ b/apt-pkg/edsp/edspsystem.cc
@@ -26,8 +26,6 @@
#include <apti18n.h>
/*}}}*/
-edspSystem edspSys;
-
// System::debSystem - Constructor /*{{{*/
edspSystem::edspSystem()
{
@@ -126,3 +124,5 @@ bool edspSystem::FindIndex(pkgCache::PkgFileIterator File,
return false;
}
/*}}}*/
+
+APT_HIDDEN edspSystem edspSys;
diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index 65e36d714..1e27d2cb0 100644
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -22,7 +22,7 @@ class pkgIndexFile;
class pkgPackageManager;
class edspIndex;
-class edspSystem : public pkgSystem
+class APT_HIDDEN edspSystem : public pkgSystem
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
@@ -42,9 +42,7 @@ class edspSystem : public pkgSystem
pkgIndexFile *&Found) const;
edspSystem();
- ~edspSystem();
+ virtual ~edspSystem();
};
-extern edspSystem edspSys;
-
#endif