Browse Source

atleast libapt should announce to itself that it is clean…

(and be it if it tries to announce that…)
debian/1.8.y
David Kalnischkies 11 years ago
parent
commit
73688d27f6
  1. 2
      apt-pkg/deb/debindexfile.cc
  2. 4
      apt-pkg/edsp/edspindexfile.cc
  3. 16
      apt-pkg/pkgcachegen.cc
  4. 4
      apt-pkg/sourcelist.h
  5. 8
      apt-pkg/srcrecords.cc
  6. 2
      buildlib/config.h.in
  7. 10
      cmdline/apt-extracttemplates.h

2
apt-pkg/deb/debindexfile.cc

@ -26,6 +26,8 @@
#include <sys/stat.h>
/*}}}*/
using std::string;
// SourcesIndex::debSourcesIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */

4
apt-pkg/edsp/edspindexfile.cc

@ -24,7 +24,7 @@
// edspIndex::edspIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
edspIndex::edspIndex(string File) : debStatusIndex(File)
edspIndex::edspIndex(std::string File) : debStatusIndex(File)
{
}
/*}}}*/
@ -44,7 +44,7 @@ bool edspIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
if (Prog != NULL)
Prog->SubProgress(0,File);
if (Gen.SelectFile(File,string(),*this) == false)
if (Gen.SelectFile(File,std::string(),*this) == false)
return _error->Error("Problem with SelectFile %s",File.c_str());
// Store the IMS information

16
apt-pkg/pkgcachegen.cc

@ -35,12 +35,14 @@
#include <apti18n.h>
/*}}}*/
typedef vector<pkgIndexFile *>::iterator FileIterator;
typedef std::vector<pkgIndexFile *>::iterator FileIterator;
template <typename Iter> std::vector<Iter*> pkgCacheGenerator::Dynamic<Iter>::toReMap;
bool IsDuplicateDescription(pkgCache::DescIterator Desc,
MD5SumValue const &CurMd5, std::string const &CurLang);
using std::string;
// CacheGenerator::pkgCacheGenerator - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* We set the dirty flag and make sure that is written to the disk */
@ -1221,14 +1223,14 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
MMap **OutMap,bool AllowMem)
{
bool const Debug = _config->FindB("Debug::pkgCacheGen", false);
vector<pkgIndexFile *> Files;
for (vector<metaIndex *>::const_iterator i = List.begin();
std::vector<pkgIndexFile *> Files;
for (std::vector<metaIndex *>::const_iterator i = List.begin();
i != List.end();
++i)
{
vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
for (vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
std::vector <pkgIndexFile *> *Indexes = (*i)->GetIndexFiles();
for (std::vector<pkgIndexFile *>::const_iterator j = Indexes->begin();
j != Indexes->end();
++j)
Files.push_back (*j);
@ -1418,7 +1420,7 @@ __deprecated bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutM
{ return pkgCacheGenerator::MakeOnlyStatusCache(&Progress, OutMap); }
bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **OutMap)
{
vector<pkgIndexFile *> Files;
std::vector<pkgIndexFile *> Files;
unsigned long EndOfSource = Files.size();
if (_system->AddStatusFiles(Files) == false)
return false;

4
apt-pkg/sourcelist.h

@ -59,11 +59,11 @@ class pkgSourceList
const char *Name;
const char *Label;
bool FixupURI(string &URI) const;
bool FixupURI(std::string &URI) const;
virtual bool ParseLine(std::vector<metaIndex *> &List,
const char *Buffer,
unsigned long const &CurLine,std::string const &File) const;
virtual bool CreateItem(vector<metaIndex *> &List,std::string const &URI,
virtual bool CreateItem(std::vector<metaIndex *> &List,std::string const &URI,
std::string const &Dist,std::string const &Section,
std::map<std::string, std::string> const &Options) const = 0;
Type();

8
apt-pkg/srcrecords.cc

@ -29,8 +29,8 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
{
for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); ++I)
{
vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
for (vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
std::vector<pkgIndexFile *> *Indexes = (*I)->GetIndexFiles();
for (std::vector<pkgIndexFile *>::const_iterator J = Indexes->begin();
J != Indexes->end(); ++J)
{
Parser* P = (*J)->CreateSrcParser();
@ -58,7 +58,7 @@ pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : Files(0), Current(0)
pkgSrcRecords::~pkgSrcRecords()
{
// Blow away all the parser objects
for(vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I)
for(std::vector<Parser*>::iterator I = Files.begin(); I != Files.end(); ++I)
delete *I;
}
/*}}}*/
@ -68,7 +68,7 @@ pkgSrcRecords::~pkgSrcRecords()
bool pkgSrcRecords::Restart()
{
Current = Files.begin();
for (vector<Parser*>::iterator I = Files.begin();
for (std::vector<Parser*>::iterator I = Files.begin();
I != Files.end(); ++I)
(*I)->Restart();

2
buildlib/config.h.in

@ -44,3 +44,5 @@
/* The package name string */
#undef PACKAGE
#define APT_8_CLEANER_HEADERS

10
cmdline/apt-extracttemplates.h

@ -14,6 +14,8 @@
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/dirstream.h>
#include <string>
class DebFile : public pkgDirStream
{
FileFd File;
@ -31,11 +33,11 @@ public:
bool Go();
bool ParseInfo();
static string GetInstalledVer(const string &package);
static std::string GetInstalledVer(const std::string &package);
string Package;
string Version;
string DepVer, PreDepVer;
std::string Package;
std::string Version;
std::string DepVer, PreDepVer;
unsigned int DepOp, PreDepOp;
char *Config;

Loading…
Cancel
Save