Browse Source

Fix more warnings from clang

Reported-By: clang++ -Werror

Conflicts:
	apt-pkg/acquire-item.cc
	apt-pkg/acquire-item.h
	apt-pkg/deb/debmetaindex.h
debian/1.8.y
Michael Vogt 8 years ago
parent
commit
80624be7c5
  1. 1
      apt-pkg/acquire-item.cc
  2. 2
      apt-pkg/acquire-item.h
  3. 2
      apt-pkg/cacheset.h
  4. 8
      apt-pkg/deb/debmetaindex.cc
  5. 3
      apt-pkg/deb/debmetaindex.h
  6. 5
      apt-pkg/deb/debsrcrecords.cc
  7. 2
      apt-pkg/pkgrecords.cc

1
apt-pkg/acquire-item.cc

@ -1620,7 +1620,6 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/
// at this point the real Items are loaded in the fetcher
ExpectedAdditionalItems = 0;
for (vector <IndexTarget*>::const_iterator Target = IndexTargets->begin();
Target != IndexTargets->end();
++Target)

2
apt-pkg/acquire-item.h

@ -745,7 +745,7 @@ class pkgAcqIndex : public pkgAcqBaseIndex
std::string ShortDesc, HashStringList const &ExpectedHashes,
std::string compressExt="");
pkgAcqIndex(pkgAcquire *Owner,
struct IndexTarget const * const Target,
IndexTarget const * const Target,
HashStringList const &ExpectedHash,
indexRecords *MetaIndexParser);
void Init(std::string const &URI, std::string const &URIDesc,

2
apt-pkg/cacheset.h

@ -584,7 +584,7 @@ public: /*{{{*/
static VersionContainer FromString(pkgCacheFile &Cache, std::string const &pkg,
Version const &fallback, CacheSetHelper &helper,
bool const onlyFromName = false) {
bool const /*onlyFromName = false*/) {
VersionContainer vercon;
VersionContainerInterface::FromString(&vercon, Cache, pkg, fallback, helper);
return vercon;

8
apt-pkg/deb/debmetaindex.cc

@ -186,8 +186,8 @@ debReleaseIndex::~debReleaseIndex() {
delete *S;
}
vector <struct IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
vector <struct IndexTarget *>* IndexTargets = new vector <IndexTarget *>;
vector <IndexTarget *>* debReleaseIndex::ComputeIndexTargets() const {
vector <IndexTarget *>* IndexTargets = new vector <IndexTarget *>;
map<string, vector<debSectionEntry const*> >::const_iterator const src = ArchEntries.find("source");
if (src != ArchEntries.end()) {
@ -255,8 +255,8 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool const &GetAll) const
// special case for --print-uris
if (GetAll) {
vector <struct IndexTarget *> *targets = ComputeIndexTargets();
for (vector <struct IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target) {
vector <IndexTarget *> *targets = ComputeIndexTargets();
for (vector <IndexTarget*>::const_iterator Target = targets->begin(); Target != targets->end(); ++Target) {
new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
(*Target)->ShortDesc, HashStringList());
}

3
apt-pkg/deb/debmetaindex.h

@ -19,6 +19,7 @@
class pkgAcquire;
class pkgIndexFile;
class debDebPkgFileIndex;
class IndexTarget;
class debReleaseIndex : public metaIndex {
public:
@ -45,7 +46,7 @@ class debReleaseIndex : public metaIndex {
virtual std::string ArchiveURI(std::string const &File) const {return URI + File;};
virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) const;
std::vector <struct IndexTarget *>* ComputeIndexTargets() const;
std::vector <IndexTarget *>* ComputeIndexTargets() const;
std::string Info(const char *Type, std::string const &Section, std::string const &Arch="") const;
std::string MetaIndexInfo(const char *Type) const;

5
apt-pkg/deb/debsrcrecords.cc

@ -57,12 +57,13 @@ const char **debSrcRecordParser::Binaries()
char* binStartNext = strchrnul(bin, ',');
char* binEnd = binStartNext - 1;
for (; isspace(*binEnd) != 0; --binEnd)
binEnd = '\0';
binEnd = 0;
StaticBinList.push_back(bin);
if (*binStartNext != ',')
break;
*binStartNext = '\0';
for (bin = binStartNext + 1; isspace(*bin) != 0; ++bin);
for (bin = binStartNext + 1; isspace(*bin) != 0; ++bin)
;
} while (*bin != '\0');
StaticBinList.push_back(NULL);

2
apt-pkg/pkgrecords.cc

@ -26,7 +26,7 @@
// Records::pkgRecords - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* This will create the necessary structures to access the status files */
pkgRecords::pkgRecords(pkgCache &Cache) : d(NULL), Cache(Cache),
pkgRecords::pkgRecords(pkgCache &aCache) : d(NULL), Cache(aCache),
Files(Cache.HeaderP->PackageFileCount)
{
for (pkgCache::PkgFileIterator I = Cache.FileBegin();

Loading…
Cancel
Save