devuan
/
apt
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

apply various style suggestions by cppcheck 

Some of them modify the ABI, but given that we prepare a big one
already, these few hardly count for much.

Git-Dch: Ignore
debian/1.8.y
David Kalnischkies 7 years ago
parent
3d5e93f7cd
commit
e8afd16892
31 changed files with 96 additions and 109 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      apt-pkg/acquire-item.cc
  2. 25
      apt-pkg/acquire-item.h
  3. 2
      apt-pkg/acquire-worker.cc
  4. 2
      apt-pkg/acquire-worker.h
  5. 4
      apt-pkg/acquire.cc
  6. 6
      apt-pkg/acquire.h
  7. 6
      apt-pkg/algorithms.h
  8. 12
      apt-pkg/cachefilter.h
  9. 8
      apt-pkg/cacheiterators.h
  10. 14
      apt-pkg/cacheset.h
  11. 2
      apt-pkg/contrib/hashes.cc
  12. 2
      apt-pkg/contrib/hashsum_template.h
  13. 4
      apt-pkg/contrib/strutl.cc
  14. 2
      apt-pkg/deb/debmetaindex.cc
  15. 6
      apt-pkg/depcache.cc
  16. 2
      apt-pkg/depcache.h
  17. 1
      apt-pkg/indexcopy.cc
  18. 2
      apt-pkg/indexfile.h
  19. 19
      apt-pkg/indexrecords.cc
  20. 13
      apt-pkg/indexrecords.h
  21. 4
      apt-pkg/install-progress.h
  22. 2
      apt-pkg/orderlist.h
  23. 2
      apt-pkg/packagemanager.h
  24. 2
      apt-pkg/pkgcachegen.h
  25. 2
      apt-pkg/pkgrecords.h
  26. 4
      apt-pkg/policy.h
  27. 2
      apt-pkg/sourcelist.h
  28. 4
      apt-pkg/srcrecords.cc
  29. 11
      apt-pkg/srcrecords.h
  30. 2
      apt-pkg/tagfile.cc
  31. 2
      cmdline/apt-extracttemplates.h

36
apt-pkg/acquire-item.cc
View File

@ -120,7 +120,7 @@ static bool AllowInsecureRepositories(indexRecords const * const MetaIndexParser
return false;
}
/*}}}*/
static HashStringList GetExpectedHashesFromFor(indexRecords * const Parser, std::string const MetaKey)/*{{{*/
static HashStringList GetExpectedHashesFromFor(indexRecords * const Parser, std::string const &MetaKey)/*{{{*/
{
if (Parser == NULL)
return HashStringList();
@ -393,7 +393,7 @@ class APT_HIDDEN NoActionItem : public pkgAcquire::Item /*{{{*/
virtual std::string DescURI() const {return Target.URI;};
virtual HashStringList GetExpectedHashes() const {return HashStringList();};
NoActionItem(pkgAcquire * const Owner, IndexTarget const Target) :
NoActionItem(pkgAcquire * const Owner, IndexTarget const &Target) :
pkgAcquire::Item(Owner), Target(Target)
{
Status = StatDone;
@ -404,9 +404,9 @@ class APT_HIDDEN NoActionItem : public pkgAcquire::Item /*{{{*/
// Acquire::Item::Item - Constructor /*{{{*/
APT_IGNORE_DEPRECATED_PUSH
pkgAcquire::Item::Item(pkgAcquire * const Owner) :
pkgAcquire::Item::Item(pkgAcquire * const owner) :
FileSize(0), PartialSize(0), Mode(0), ID(0), Complete(false), Local(false),
QueueCounter(0), ExpectedAdditionalItems(0), Owner(Owner)
QueueCounter(0), ExpectedAdditionalItems(0), Owner(owner)
{
Owner->Add(this);
Status = StatIdle;
@ -661,8 +661,8 @@ std::string pkgAcquire::Item::HashSum() const /*{{{*/
/*}}}*/
pkgAcqTransactionItem::pkgAcqTransactionItem(pkgAcquire * const Owner, /*{{{*/
pkgAcqMetaBase * const TransactionManager, IndexTarget const Target) :
pkgAcquire::Item(Owner), Target(Target), TransactionManager(TransactionManager)
pkgAcqMetaBase * const transactionManager, IndexTarget const &target) :
pkgAcquire::Item(Owner), Target(target), TransactionManager(transactionManager)
{
if (TransactionManager != this)
TransactionManager->Add(this);
@ -672,7 +672,7 @@ pkgAcqTransactionItem::~pkgAcqTransactionItem() /*{{{*/
{
}
/*}}}*/
HashStringList pkgAcqTransactionItem::GetExpectedHashesFor(std::string const MetaKey) const /*{{{*/
HashStringList pkgAcqTransactionItem::GetExpectedHashesFor(std::string const &MetaKey) const /*{{{*/
{
return GetExpectedHashesFromFor(TransactionManager->MetaIndexParser, MetaKey);
}
@ -681,7 +681,7 @@ HashStringList pkgAcqTransactionItem::GetExpectedHashesFor(std::string const Met
// AcqMetaBase - Constructor /*{{{*/
pkgAcqMetaBase::pkgAcqMetaBase(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
std::vector<IndexTarget> const IndexTargets,
std::vector<IndexTarget> const &IndexTargets,
IndexTarget const &DataTarget,
indexRecords * const MetaIndexParser)
: pkgAcqTransactionItem(Owner, TransactionManager, DataTarget),
@ -1103,11 +1103,11 @@ pkgAcqMetaBase::~pkgAcqMetaBase() {}
pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire * const Owner, /*{{{*/
IndexTarget const &ClearsignedTarget,
IndexTarget const &DetachedDataTarget, IndexTarget const &DetachedSigTarget,
std::vector<IndexTarget> const IndexTargets,
std::vector<IndexTarget> const &IndexTargets,
indexRecords * const MetaIndexParser) :
pkgAcqMetaIndex(Owner, this, ClearsignedTarget, DetachedSigTarget, IndexTargets, MetaIndexParser),
ClearsignedTarget(ClearsignedTarget),
DetachedDataTarget(DetachedDataTarget), DetachedSigTarget(DetachedSigTarget)
DetachedDataTarget(DetachedDataTarget)
{
// index targets + (worst case:) Release/Release.gpg
ExpectedAdditionalItems = IndexTargets.size() + 2;
@ -1243,7 +1243,7 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire * const Owner, /*{{{*/
pkgAcqMetaBase * const TransactionManager,
IndexTarget const &DataTarget,
IndexTarget const &DetachedSigTarget,
vector<IndexTarget> const IndexTargets,
vector<IndexTarget> const &IndexTargets,
indexRecords * const MetaIndexParser) :
pkgAcqMetaBase(Owner, TransactionManager, IndexTargets, DataTarget, MetaIndexParser),
DetachedSigTarget(DetachedSigTarget)
@ -1325,7 +1325,7 @@ pkgAcqMetaIndex::~pkgAcqMetaIndex() {}
// AcqMetaSig::AcqMetaSig - Constructor /*{{{*/
pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target,
IndexTarget const &Target,
pkgAcqMetaIndex * const MetaIndex) :
pkgAcqTransactionItem(Owner, TransactionManager, Target), MetaIndex(MetaIndex)
{
@ -1488,7 +1488,7 @@ void pkgAcqMetaSig::Failed(string const &Message,pkgAcquire::MethodConfig const
// AcqBaseIndex - Constructor /*{{{*/
pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target)
IndexTarget const &Target)
: pkgAcqTransactionItem(Owner, TransactionManager, Target)
{
}
@ -1504,7 +1504,7 @@ pkgAcqBaseIndex::~pkgAcqBaseIndex() {}
*/
pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target)
IndexTarget const &Target)
: pkgAcqBaseIndex(Owner, TransactionManager, Target)
{
Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
@ -1905,7 +1905,7 @@ pkgAcqDiffIndex::~pkgAcqDiffIndex() {}
*/
pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target,
IndexTarget const &Target,
vector<DiffInfo> const &diffs)
: pkgAcqBaseIndex(Owner, TransactionManager, Target),
available_patches(diffs)
@ -2128,7 +2128,7 @@ pkgAcqIndexDiffs::~pkgAcqIndexDiffs() {}
// AcqIndexMergeDiffs::AcqIndexMergeDiffs - Constructor /*{{{*/
pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target,
IndexTarget const &Target,
DiffInfo const &patch,
std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches)
: pkgAcqBaseIndex(Owner, TransactionManager, Target),
@ -2273,8 +2273,8 @@ pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs() {}
// AcqIndex::AcqIndex - Constructor /*{{{*/
pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target)
: pkgAcqBaseIndex(Owner, TransactionManager, Target)
IndexTarget const &Target)
: pkgAcqBaseIndex(Owner, TransactionManager, Target), Stage(STAGE_DOWNLOAD)
{
// autoselect the compression method
AutoSelectCompression();

25
apt-pkg/acquire-item.h
View File

@ -276,7 +276,7 @@ class pkgAcquire::Item : public WeakPointable /*{{{*/
*
* \param Owner The new owner of this item.
*/
Item(pkgAcquire * const Owner);
explicit Item(pkgAcquire * const Owner);
/** \brief Remove this item from its owner's queue by invoking
* pkgAcquire::Remove.
@ -347,7 +347,7 @@ class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item /*{{{*/
void *d;
protected:
IndexTarget const Target;
HashStringList GetExpectedHashesFor(std::string const MetaKey) const;
HashStringList GetExpectedHashesFor(std::string const &MetaKey) const;
bool QueueURI(pkgAcquire::ItemDesc &Item);
@ -370,7 +370,7 @@ class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item /*{{{*/
virtual bool HashesRequired() const;
pkgAcqTransactionItem(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const Target);
pkgAcqTransactionItem(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const &Target);
virtual ~pkgAcqTransactionItem();
friend class pkgAcqMetaBase;
@ -474,7 +474,7 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem /*{{{*/
virtual std::string GetFinalFilename() const;
pkgAcqMetaBase(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
std::vector<IndexTarget> const IndexTargets,
std::vector<IndexTarget> const &IndexTargets,
IndexTarget const &DataTarget,
indexRecords* const MetaIndexParser);
virtual ~pkgAcqMetaBase();
@ -511,7 +511,7 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
/** \brief Create a new pkgAcqMetaIndex. */
pkgAcqMetaIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
IndexTarget const &DataTarget, IndexTarget const &DetachedSigTarget,
std::vector<IndexTarget> const IndexTargets, indexRecords * const MetaIndexParser);
std::vector<IndexTarget> const &IndexTargets, indexRecords * const MetaIndexParser);
virtual ~pkgAcqMetaIndex();
friend class pkgAcqMetaSig;
@ -548,7 +548,7 @@ class APT_HIDDEN pkgAcqMetaSig : public pkgAcqTransactionItem
pkgAcquire::MethodConfig const * const Cnf);
/** \brief Create a new pkgAcqMetaSig. */
pkgAcqMetaSig(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const Target,
pkgAcqMetaSig(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager, IndexTarget const &Target,
pkgAcqMetaIndex * const MetaIndex);
virtual ~pkgAcqMetaSig();
};
@ -560,7 +560,6 @@ class APT_HIDDEN pkgAcqMetaClearSig : public pkgAcqMetaIndex
IndexTarget const ClearsignedTarget;
IndexTarget const DetachedDataTarget;
IndexTarget const DetachedSigTarget;
public:
virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf);
@ -573,7 +572,7 @@ public:
IndexTarget const &ClearsignedTarget,
IndexTarget const &DetachedDataTarget,
IndexTarget const &DetachedSigTarget,
std::vector<IndexTarget> const IndexTargets,
std::vector<IndexTarget> const &IndexTargets,
indexRecords * const MetaIndexParser);
virtual ~pkgAcqMetaClearSig();
};
@ -588,7 +587,7 @@ class APT_HIDDEN pkgAcqBaseIndex : public pkgAcqTransactionItem
virtual std::string GetFinalFilename() const;
pkgAcqBaseIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target);
IndexTarget const &Target);
virtual ~pkgAcqBaseIndex();
};
/*}}}*/
@ -652,7 +651,7 @@ class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
* \param ShortDesc A short description of the list file to download.
*/
pkgAcqDiffIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target);
IndexTarget const &Target);
virtual ~pkgAcqDiffIndex();
private:
APT_HIDDEN void QueueOnIMSHit() const;
@ -751,7 +750,7 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
* check if it was the last one to complete the download step
*/
pkgAcqIndexMergeDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target, DiffInfo const &patch,
IndexTarget const &Target, DiffInfo const &patch,
std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches);
virtual ~pkgAcqIndexMergeDiffs();
};
@ -865,7 +864,7 @@ class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
* that depends on it.
*/
pkgAcqIndexDiffs(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target,
IndexTarget const &Target,
std::vector<DiffInfo> const &diffs=std::vector<DiffInfo>());
virtual ~pkgAcqIndexDiffs();
};
@ -943,7 +942,7 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
virtual std::string GetMetaKey() const;
pkgAcqIndex(pkgAcquire * const Owner, pkgAcqMetaBase * const TransactionManager,
IndexTarget const Target);
IndexTarget const &Target);
virtual ~pkgAcqIndex();
private:

2
apt-pkg/acquire-worker.cc
View File

@ -47,7 +47,7 @@ using namespace std;
// ---------------------------------------------------------------------
/* */
pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
pkgAcquireStatus *Log) : Log(Log)
pkgAcquireStatus *log) : Log(log)
{
OwnerQ = Q;
Config = Cnf;

2
apt-pkg/acquire-worker.h
View File

@ -317,7 +317,7 @@ class pkgAcquire::Worker : public WeakPointable
* \param Config A location in which to store information about
* the fetch method.
*/
Worker(MethodConfig *Config);
explicit Worker(MethodConfig *Config);
/** \brief Clean up this worker.
*

4
apt-pkg/acquire.cc
View File

@ -653,8 +653,8 @@ pkgAcquire::MethodConfig::MethodConfig() : d(NULL), Next(0), SingleInstance(fals
// Queue::Queue - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
pkgAcquire::Queue::Queue(string Name,pkgAcquire *Owner) : d(NULL), Next(0),
Name(Name), Items(0), Workers(0), Owner(Owner), PipeDepth(0), MaxPipeDepth(1)
pkgAcquire::Queue::Queue(string const &name,pkgAcquire * const owner) : d(NULL), Next(0),
Name(name), Items(0), Workers(0), Owner(owner), PipeDepth(0), MaxPipeDepth(1)
{
}
/*}}}*/

6
apt-pkg/acquire.h
View File

@ -369,7 +369,7 @@ class pkgAcquire
bool GetLock(std::string const &Lock);
/** \brief Construct a new pkgAcquire. */
pkgAcquire(pkgAcquireStatus *Log);
explicit pkgAcquire(pkgAcquireStatus *Log);
pkgAcquire();
/** \brief Destroy this pkgAcquire object.
@ -584,7 +584,7 @@ class pkgAcquire::Queue
* \param Name The name of the new queue.
* \param Owner The download process that owns the new queue.
*/
Queue(std::string Name,pkgAcquire *Owner);
Queue(std::string const &Name,pkgAcquire * const Owner);
/** Shut down all the worker processes associated with this queue
* and empty the queue.
@ -625,7 +625,7 @@ class pkgAcquire::UriIterator
*
* \param Q The queue over which this UriIterator should iterate.
*/
UriIterator(pkgAcquire::Queue *Q);
explicit UriIterator(pkgAcquire::Queue *Q);
virtual ~UriIterator();
};
/*}}}*/

6
apt-pkg/algorithms.h
View File

@ -67,7 +67,7 @@ class pkgSimulate : public pkgPackageManager /*{{{*/
return (*Cache)[Pkg].CandidateVerIter(*Cache);
}
Policy(pkgDepCache *Cache) : Cache(Cache) {};
explicit Policy(pkgDepCache *Cache) : Cache(Cache) {};
};
unsigned char *Flags;
@ -87,7 +87,7 @@ private:
public:
pkgSimulate(pkgDepCache *Cache);
explicit pkgSimulate(pkgDepCache *Cache);
virtual ~pkgSimulate();
};
/*}}}*/
@ -155,7 +155,7 @@ class pkgProblemResolver /*{{{*/
APT_DEPRECATED void InstallProtect();
pkgProblemResolver(pkgDepCache *Cache);
explicit pkgProblemResolver(pkgDepCache *Cache);
virtual ~pkgProblemResolver();
};
/*}}}*/

12
apt-pkg/cachefilter.h
View File

@ -53,7 +53,7 @@ public:
class NOTMatcher : public Matcher {
Matcher * const matcher;
public:
NOTMatcher(Matcher * const matcher);
explicit NOTMatcher(Matcher * const matcher);
virtual bool operator() (pkgCache::PkgIterator const &Pkg);
virtual bool operator() (pkgCache::GrpIterator const &Grp);
virtual bool operator() (pkgCache::VerIterator const &Ver);
@ -65,7 +65,7 @@ class ANDMatcher : public Matcher {
public:
// 5 ought to be enough for everybody… c++11 variadic templates would be nice
ANDMatcher();
ANDMatcher(Matcher * const matcher1);
explicit ANDMatcher(Matcher * const matcher1);
ANDMatcher(Matcher * const matcher1, Matcher * const matcher2);
ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3);
ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4);
@ -81,7 +81,7 @@ class ORMatcher : public Matcher {
public:
// 5 ought to be enough for everybody… c++11 variadic templates would be nice
ORMatcher();
ORMatcher(Matcher * const matcher1);
explicit ORMatcher(Matcher * const matcher1);
ORMatcher(Matcher * const matcher1, Matcher * const matcher2);
ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3);
ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4);
@ -96,7 +96,7 @@ public:
class PackageNameMatchesRegEx : public PackageMatcher { /*{{{*/
regex_t* pattern;
public:
PackageNameMatchesRegEx(std::string const &Pattern);
explicit PackageNameMatchesRegEx(std::string const &Pattern);
virtual bool operator() (pkgCache::PkgIterator const &Pkg);
virtual bool operator() (pkgCache::GrpIterator const &Grp);
virtual ~PackageNameMatchesRegEx();
@ -105,7 +105,7 @@ public:
class PackageNameMatchesFnmatch : public PackageMatcher { /*{{{*/
const std::string Pattern;
public:
PackageNameMatchesFnmatch(std::string const &Pattern);
explicit PackageNameMatchesFnmatch(std::string const &Pattern);
virtual bool operator() (pkgCache::PkgIterator const &Pkg);
virtual bool operator() (pkgCache::GrpIterator const &Grp);
virtual ~PackageNameMatchesFnmatch() {};
@ -140,7 +140,7 @@ public:
class PackageIsNewInstall : public PackageMatcher { /*{{{*/
pkgCacheFile * const Cache;
public:
PackageIsNewInstall(pkgCacheFile * const Cache);
explicit PackageIsNewInstall(pkgCacheFile * const Cache);
virtual bool operator() (pkgCache::PkgIterator const &Pkg);
virtual ~PackageIsNewInstall();
};

8
apt-pkg/cacheiterators.h
View File

@ -107,7 +107,7 @@ class pkgCache::GrpIterator: public Iterator<Group, GrpIterator> {
public:
// This constructor is the 'begin' constructor, never use it.
inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) {
explicit inline GrpIterator(pkgCache &Owner) : Iterator<Group, GrpIterator>(Owner), HashIndex(-1) {
S = OwnerPointer();
operator ++(0);
}
@ -148,7 +148,7 @@ class pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
public:
// This constructor is the 'begin' constructor, never use it.
inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) {
explicit inline PkgIterator(pkgCache &Owner) : Iterator<Package, PkgIterator>(Owner), HashIndex(-1) {
S = OwnerPointer();
operator ++(0);
}
@ -394,7 +394,7 @@ class pkgCache::RlsFileIterator : public Iterator<ReleaseFile, RlsFileIterator>
// Constructors
inline RlsFileIterator() : Iterator<ReleaseFile, RlsFileIterator>() {}
inline RlsFileIterator(pkgCache &Owner) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Owner.RlsFileP) {}
explicit inline RlsFileIterator(pkgCache &Owner) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Owner.RlsFileP) {}
inline RlsFileIterator(pkgCache &Owner,ReleaseFile *Trg) : Iterator<ReleaseFile, RlsFileIterator>(Owner, Trg) {}
};
/*}}}*/
@ -430,7 +430,7 @@ class pkgCache::PkgFileIterator : public Iterator<PackageFile, PkgFileIterator>
// Constructors
inline PkgFileIterator() : Iterator<PackageFile, PkgFileIterator>() {}
inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {}
explicit inline PkgFileIterator(pkgCache &Owner) : Iterator<PackageFile, PkgFileIterator>(Owner, Owner.PkgFileP) {}
inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Iterator<PackageFile, PkgFileIterator>(Owner, Trg) {}
};
/*}}}*/

14
apt-pkg/cacheset.h
View File

@ -265,7 +265,7 @@ APT_IGNORE_DEPRECATED_POP
void setConstructor(CacheSetHelper::PkgSelector const by) { ConstructedBy = by; }
CacheSetHelper::PkgSelector getConstructor() const { return ConstructedBy; }
PackageContainerInterface();
PackageContainerInterface(CacheSetHelper::PkgSelector const by);
explicit PackageContainerInterface(CacheSetHelper::PkgSelector const by);
virtual ~PackageContainerInterface();
APT_DEPRECATED static bool FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
@ -310,7 +310,7 @@ public: /*{{{*/
public std::iterator<std::forward_iterator_tag, typename Container::const_iterator> {
typename Container::const_iterator _iter;
public:
const_iterator(typename Container::const_iterator i) : _iter(i) {}
explicit const_iterator(typename Container::const_iterator i) : _iter(i) {}
pkgCache::PkgIterator getPkg(void) const { return *_iter; }
inline pkgCache::PkgIterator operator*(void) const { return *_iter; }
operator typename Container::const_iterator(void) const { return _iter; }
@ -324,7 +324,7 @@ public: /*{{{*/
public std::iterator<std::forward_iterator_tag, typename Container::iterator> {
typename Container::iterator _iter;
public:
iterator(typename Container::iterator i) : _iter(i) {}
explicit iterator(typename Container::iterator i) : _iter(i) {}
pkgCache::PkgIterator getPkg(void) const { return *_iter; }
inline pkgCache::PkgIterator operator*(void) const { return *_iter; }
operator typename Container::iterator(void) const { return _iter; }
@ -359,7 +359,7 @@ public: /*{{{*/
const_iterator find(pkgCache::PkgIterator const &P) const { return const_iterator(_cont.find(P)); }
PackageContainer() : PackageContainerInterface(CacheSetHelper::UNKNOWN) {}
PackageContainer(CacheSetHelper::PkgSelector const &by) : PackageContainerInterface(by) {}
explicit PackageContainer(CacheSetHelper::PkgSelector const &by) : PackageContainerInterface(by) {}
APT_IGNORE_DEPRECATED_PUSH
APT_DEPRECATED PackageContainer(Constructor const &by) : PackageContainerInterface((CacheSetHelper::PkgSelector)by) {}
APT_IGNORE_DEPRECATED_POP
@ -568,7 +568,7 @@ public:
APT_PUBLIC iterator begin() { return _cont->PkgBegin(); }
APT_PUBLIC iterator end() { return _cont->PkgEnd(); }
APT_PUBLIC PackageUniverse(pkgCache * const Owner);
explicit APT_PUBLIC PackageUniverse(pkgCache * const Owner);
APT_PUBLIC virtual ~PackageUniverse();
private:
@ -744,7 +744,7 @@ public: /*{{{*/
public std::iterator<std::forward_iterator_tag, typename Container::const_iterator> {/*{{{*/
typename Container::const_iterator _iter;
public:
const_iterator(typename Container::const_iterator i) : _iter(i) {}
explicit const_iterator(typename Container::const_iterator i) : _iter(i) {}
pkgCache::VerIterator getVer(void) const { return *_iter; }
inline pkgCache::VerIterator operator*(void) const { return *_iter; }
operator typename Container::const_iterator(void) const { return _iter; }
@ -758,7 +758,7 @@ public: /*{{{*/
public std::iterator<std::forward_iterator_tag, typename Container::iterator> {
typename Container::iterator _iter;
public:
iterator(typename Container::iterator i) : _iter(i) {}
explicit iterator(typename Container::iterator i) : _iter(i) {}
pkgCache::VerIterator getVer(void) const { return *_iter; }
inline pkgCache::VerIterator operator*(void) const { return *_iter; }
operator typename Container::iterator(void) const { return _iter; }

2
apt-pkg/contrib/hashes.cc
View File

@ -276,7 +276,7 @@ public:
unsigned long long FileSize;
unsigned int CalcHashes;
PrivateHashes(unsigned int const CalcHashes) : FileSize(0), CalcHashes(CalcHashes) {}
explicit PrivateHashes(unsigned int const CalcHashes) : FileSize(0), CalcHashes(CalcHashes) {}
};
/*}}}*/
// Hashes::Add* - Add the contents of data or FD /*{{{*/

2
apt-pkg/contrib/hashsum_template.h
View File

@ -87,7 +87,7 @@ class HashSumValue
Sum[I] = S[I];
}
HashSumValue(std::string Str)
explicit HashSumValue(std::string const &Str)
{
memset(Sum,0,sizeof(Sum));
Set(Str);

4
apt-pkg/contrib/strutl.cc
View File

@ -1308,7 +1308,7 @@ void ioprintf(ostream &out,const char *format,...)
va_list args;
ssize_t size = 400;
while (true) {
bool ret = false;
bool ret;
va_start(args,format);
ret = iovprintf(out, format, args, size);
va_end(args);
@ -1322,7 +1322,7 @@ void strprintf(string &out,const char *format,...)
ssize_t size = 400;
std::ostringstream outstr;
while (true) {
bool ret = false;
bool ret;
va_start(args,format);
ret = iovprintf(outstr, format, args, size);
va_end(args);

2
apt-pkg/deb/debmetaindex.cc
View File

@ -103,7 +103,7 @@ debReleaseIndex::~debReleaseIndex() {
}
template<typename CallC>
void foreachTarget(std::string const URI, std::string const Dist,
void foreachTarget(std::string const &URI, std::string const &Dist,
std::map<std::string, std::vector<debReleaseIndex::debSectionEntry const *> > const &ArchEntries,
CallC &Call)
{

6
apt-pkg/depcache.cc
View File

@ -95,7 +95,9 @@ pkgDepCache::ActionGroup::~ActionGroup()
// ---------------------------------------------------------------------
/* */
pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) :
group_level(0), Cache(pCache), PkgState(0), DepState(0)
group_level(0), Cache(pCache), PkgState(0), DepState(0),
iUsrSize(0), iDownloadSize(0), iInstCount(0), iDelCount(0), iKeepCount(0),
iBrokenCount(0), iPolicyBrokenCount(0), iBadCount(0)
{
DebugMarker = _config->FindB("Debug::pkgDepCache::Marker", false);
DebugAutoInstall = _config->FindB("Debug::pkgDepCache::AutoInstall", false);
@ -947,7 +949,7 @@ bool pkgDepCache::IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
/* */
struct CompareProviders {
pkgCache::PkgIterator const Pkg;
CompareProviders(pkgCache::DepIterator const &Dep) : Pkg(Dep.TargetPkg()) {};
explicit CompareProviders(pkgCache::DepIterator const &Dep) : Pkg(Dep.TargetPkg()) {};
//bool operator() (APT::VersionList::iterator const &AV, APT::VersionList::iterator const &BV)
bool operator() (pkgCache::VerIterator const &AV, pkgCache::VerIterator const &BV)
{

2
apt-pkg/depcache.h
View File

@ -179,7 +179,7 @@ class pkgDepCache : protected pkgCache::Namespace
* As long as this object exists, no automatic cleanup
* operations will be undertaken.
*/
ActionGroup(pkgDepCache &cache);
explicit ActionGroup(pkgDepCache &cache);
/** \brief Clean up the action group before it is destroyed.
*

1
apt-pkg/indexcopy.cc
View File

@ -424,7 +424,6 @@ bool PackageCopy::GetFile(string &File,unsigned long long &Size)
// PackageCopy::RewriteEntry - Rewrite the entry with a new filename /*{{{*/
bool PackageCopy::RewriteEntry(FileFd &Target,string const &File)
{
string const Dir(File,0,File.rfind('/'));
std::vector<pkgTagSection::Tag> Changes;
Changes.push_back(pkgTagSection::Tag::Rewrite("Filename", File));

2
apt-pkg/indexfile.h
View File

@ -144,7 +144,7 @@ class pkgIndexFile
bool IsTrusted() const { return Trusted; };
pkgIndexFile(bool Trusted);
explicit pkgIndexFile(bool Trusted);
virtual ~pkgIndexFile();
};

19
apt-pkg/indexrecords.cc
View File

@ -42,7 +42,7 @@ APT_PURE bool indexRecords::GetSupportsAcquireByHash() const
return this->SupportsAcquireByHash;
}
APT_PURE bool indexRecords::CheckDist(const string MaybeDist) const
APT_PURE bool indexRecords::CheckDist(string const &MaybeDist) const
{
return (this->Dist == MaybeDist
|| this->Suite == MaybeDist);
@ -63,7 +63,7 @@ APT_PURE time_t indexRecords::GetDate() const
return this->Date;
}
APT_PURE indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
APT_PURE indexRecords::checkSum *indexRecords::Lookup(string const &MetaKey)
{
std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
if (sum == Entries.end())
@ -76,7 +76,7 @@ APT_PURE bool indexRecords::Exists(string const &MetaKey) const
return Entries.find(MetaKey) != Entries.end();
}
bool indexRecords::Load(const string Filename) /*{{{*/
bool indexRecords::Load(string const &Filename) /*{{{*/
{
FileFd Fd;
if (OpenMaybeClearSignedFile(Filename, Fd) == false)
@ -272,23 +272,10 @@ void indexRecords::SetTrusted(bool const Trusted)
this->Trusted = NEVER_TRUSTED;
}
#if APT_PKG_ABI >= 413
indexRecords::indexRecords(const string &ExpectedDist) :
Trusted(CHECK_TRUST), d(NULL), ExpectedDist(ExpectedDist), ValidUntil(0),
SupportsAcquireByHash(false)
{
}
#else
indexRecords::indexRecords() :
Trusted(CHECK_TRUST), d(NULL), ExpectedDist(""), ValidUntil(0),
SupportsAcquireByHash(false)
{
}
indexRecords::indexRecords(const string ExpectedDist) :
Trusted(CHECK_TRUST), d(NULL), ExpectedDist(ExpectedDist), ValidUntil(0),
SupportsAcquireByHash(false)
{
}
#endif
indexRecords::~indexRecords() {}

13
apt-pkg/indexrecords.h
View File

@ -40,21 +40,16 @@ class indexRecords
std::map<std::string,checkSum *> Entries;
public:
#if APT_PKG_ABI >= 413
indexRecords(const std::string &ExpectedDist = "");
#else
indexRecords();
indexRecords(const std::string ExpectedDist);
#endif
explicit indexRecords(const std::string &ExpectedDist = "");
// Lookup function
virtual checkSum *Lookup(const std::string MetaKey);
virtual checkSum *Lookup(std::string const &MetaKey);
/** \brief tests if a checksum for this file is available */
bool Exists(std::string const &MetaKey) const;
std::vector<std::string> MetaKeys();
virtual bool Load(std::string Filename);
virtual bool CheckDist(const std::string MaybeDist) const;
virtual bool Load(std::string const &Filename);
virtual bool CheckDist(std::string const &MaybeDist) const;
std::string GetDist() const;
std::string GetSuite() const;

4
apt-pkg/install-progress.h
View File

@ -69,7 +69,7 @@ namespace Progress {
void WriteToStatusFd(std::string msg);
public:
PackageManagerProgressFd(int progress_fd);
explicit PackageManagerProgressFd(int progress_fd);
virtual ~PackageManagerProgressFd();
virtual void StartDpkg();
@ -100,7 +100,7 @@ namespace Progress {
void WriteToStatusFd(std::string msg);
public:
PackageManagerProgressDeb822Fd(int progress_fd);
explicit PackageManagerProgressDeb822Fd(int progress_fd);
virtual ~PackageManagerProgressDeb822Fd();
virtual void StartDpkg();

2
apt-pkg/orderlist.h
View File

@ -122,7 +122,7 @@ class pkgOrderList : protected pkgCache::Namespace
int Score(PkgIterator Pkg);
pkgOrderList(pkgDepCache *Cache);
explicit pkgOrderList(pkgDepCache *Cache);
virtual ~pkgOrderList();
};

2
apt-pkg/packagemanager.h
View File

@ -141,7 +141,7 @@ class pkgPackageManager : protected pkgCache::Namespace
/** \brief returns all packages dpkg let disappear */
inline std::set<std::string> GetDisappearedPackages() { return disappearedPkgs; };
pkgPackageManager(pkgDepCache *Cache);
explicit pkgPackageManager(pkgDepCache *Cache);
virtual ~pkgPackageManager();
private:

2
apt-pkg/pkgcachegen.h
View File

@ -54,7 +54,7 @@ class APT_HIDDEN pkgCacheGenerator /*{{{*/
template<typename Iter> class Dynamic {
public:
static std::vector<Iter*> toReMap;
Dynamic(Iter &I) {
explicit Dynamic(Iter &I) {
toReMap.push_back(&I);
}

2
apt-pkg/pkgrecords.h
View File

@ -42,7 +42,7 @@ class pkgRecords /*{{{*/
Parser &Lookup(pkgCache::DescFileIterator const &Desc);
// Construct destruct
pkgRecords(pkgCache &Cache);
explicit pkgRecords(pkgCache &Cache);
virtual ~pkgRecords();
};
/*}}}*/

4
apt-pkg/policy.h
View File

@ -59,7 +59,7 @@ class pkgPolicy : public pkgDepCache::Policy
struct PkgPin : Pin
{
std::string Pkg;
PkgPin(std::string const &Pkg) : Pin(), Pkg(Pkg) {};
explicit PkgPin(std::string const &Pkg) : Pin(), Pkg(Pkg) {};
};
Pin *Pins;
@ -85,7 +85,7 @@ class pkgPolicy : public pkgDepCache::Policy
bool InitDefaults();
pkgPolicy(pkgCache *Owner);
explicit pkgPolicy(pkgCache *Owner);
virtual ~pkgPolicy();
private:
pkgCache::VerIterator GetCandidateVerNew(pkgCache::PkgIterator const &Pkg);

2
apt-pkg/sourcelist.h
View File

@ -117,7 +117,7 @@ class pkgSourceList
time_t GetLastModifiedTime();
pkgSourceList();
pkgSourceList(std::string File);
explicit pkgSourceList(std::string File);
virtual ~pkgSourceList();
};

4
apt-pkg/srcrecords.cc
View File

@ -178,3 +178,7 @@ bool pkgSrcRecords::Parser::Files2(std::vector<pkgSrcRecords::File2> &F2)/*{{{*/
return true;
}
/*}}}*/
pkgSrcRecords::Parser::Parser(const pkgIndexFile *Index) : iIndex(Index) {}
pkgSrcRecords::Parser::~Parser() {}

11
apt-pkg/srcrecords.h
View File

@ -48,6 +48,7 @@ APT_IGNORE_DEPRECATED_POP
// Abstract parser for each source record
class Parser
{
void *d;
protected:
const pkgIndexFile *iIndex;
@ -85,9 +86,9 @@ APT_IGNORE_DEPRECATED_POP
virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
bool Files2(std::vector<pkgSrcRecords::File2> &F);
Parser(const pkgIndexFile *Index) : iIndex(Index) {};
virtual ~Parser() {};
explicit Parser(const pkgIndexFile *Index);
virtual ~Parser();
};
private:
@ -110,8 +111,8 @@ APT_IGNORE_DEPRECATED_POP
// Locate a package by name and return pointer to the Parser.
// The pointer is owned by libapt.
Parser* Find(const char *Package,bool const &SrcOnly = false);
pkgSrcRecords(pkgSourceList &List);
explicit pkgSrcRecords(pkgSourceList &List);
virtual ~pkgSrcRecords();
};

2
apt-pkg/tagfile.cc
View File

@ -59,7 +59,7 @@ public:
unsigned int StartValue;
unsigned int NextInBucket;
TagData(unsigned int const StartTag) : StartTag(StartTag), EndTag(0), StartValue(0), NextInBucket(0) {}
explicit TagData(unsigned int const StartTag) : StartTag(StartTag), EndTag(0), StartValue(0), NextInBucket(0) {}
};
std::vector<TagData> Tags;
};

2
cmdline/apt-extracttemplates.h
View File

@ -24,7 +24,7 @@ class DebFile : public pkgDirStream
unsigned long ControlLen;
public:
DebFile(const char *FileName);
explicit DebFile(const char *FileName);
~DebFile();
bool DoItem(Item &I, int &fd);
bool Process(pkgDirStream::Item &I, const unsigned char *data,

Write Preview
Loading…
Cancel
Save