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

make all d-pointer * const pointers 

Doing this disables the implicit copy assignment operator (among others)
which would cause hovac if used on the classes as it would just copy the
pointer, not the data the d-pointer points to. For most of the classes
we don't need a copy assignment operator anyway and in many classes it
was broken before as many contain a pointer of some sort.

Only for our Cacheset Container interfaces we define an explicit copy
assignment operator which could later be implemented to copy the data
from one d-pointer to the other if we need it.

Git-Dch: Ignore
debian/1.8.y
David Kalnischkies 7 years ago
parent
e8afd16892
commit
6c55f07a5f
72 changed files with 244 additions and 234 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. 26
      apt-pkg/acquire-item.cc
  2. 28
      apt-pkg/acquire-item.h
  3. 4
      apt-pkg/acquire-method.cc
  4. 4
      apt-pkg/acquire-method.h
  5. 13
      apt-pkg/acquire-worker.cc
  6. 2
      apt-pkg/acquire-worker.h
  7. 4
      apt-pkg/acquire.cc
  8. 10
      apt-pkg/acquire.h
  9. 2
      apt-pkg/algorithms.cc
  10. 4
      apt-pkg/algorithms.h
  11. 2
      apt-pkg/cachefile.h
  12. 19
      apt-pkg/cacheset.cc
  13. 10
      apt-pkg/cacheset.h
  14. 6
      apt-pkg/cdrom.cc
  15. 6
      apt-pkg/cdrom.h
  16. 2
      apt-pkg/clean.cc
  17. 2
      apt-pkg/clean.h
  18. 19
      apt-pkg/contrib/fileutl.cc
  19. 27
      apt-pkg/contrib/fileutl.h
  20. 29
      apt-pkg/contrib/hashes.cc
  21. 2
      apt-pkg/contrib/hashes.h
  22. 12
      apt-pkg/deb/debindexfile.cc
  23. 12
      apt-pkg/deb/debindexfile.h
  24. 2
      apt-pkg/deb/deblistparser.cc
  25. 2
      apt-pkg/deb/deblistparser.h
  26. 6
      apt-pkg/deb/debmetaindex.cc
  27. 4
      apt-pkg/deb/debmetaindex.h
  28. 6
      apt-pkg/deb/debrecords.cc
  29. 6
      apt-pkg/deb/debrecords.h
  30. 2
      apt-pkg/deb/debsrcrecords.cc
  31. 2
      apt-pkg/deb/debsrcrecords.h
  32. 5
      apt-pkg/deb/debsystem.cc
  33. 2
      apt-pkg/deb/debsystem.h
  34. 5
      apt-pkg/deb/dpkgpm.cc
  35. 2
      apt-pkg/deb/dpkgpm.h
  36. 4
      apt-pkg/depcache.cc
  37. 4
      apt-pkg/depcache.h
  38. 2
      apt-pkg/edsp/edspindexfile.cc
  39. 2
      apt-pkg/edsp/edspindexfile.h
  40. 2
      apt-pkg/edsp/edsplistparser.cc
  41. 2
      apt-pkg/edsp/edsplistparser.h
  42. 8
      apt-pkg/edsp/edspsystem.cc
  43. 2
      apt-pkg/edsp/edspsystem.h
  44. 10
      apt-pkg/indexcopy.cc
  45. 10
      apt-pkg/indexcopy.h
  46. 4
      apt-pkg/indexfile.cc
  47. 4
      apt-pkg/indexfile.h
  48. 2
      apt-pkg/indexrecords.h
  49. 8
      apt-pkg/install-progress.cc
  50. 10
      apt-pkg/install-progress.h
  51. 2
      apt-pkg/metaindex.cc
  52. 2
      apt-pkg/metaindex.h
  53. 2
      apt-pkg/orderlist.cc
  54. 2
      apt-pkg/orderlist.h
  55. 2
      apt-pkg/packagemanager.cc
  56. 2
      apt-pkg/packagemanager.h
  57. 2
      apt-pkg/pkgcache.cc
  58. 2
      apt-pkg/pkgcache.h
  59. 4
      apt-pkg/pkgcachegen.cc
  60. 4
      apt-pkg/pkgcachegen.h
  61. 2
      apt-pkg/pkgrecords.cc
  62. 4
      apt-pkg/pkgrecords.h
  63. 3
      apt-pkg/pkgsystem.cc
  64. 10
      apt-pkg/pkgsystem.h
  65. 2
      apt-pkg/policy.cc
  66. 4
      apt-pkg/policy.h
  67. 4
      apt-pkg/sourcelist.cc
  68. 2
      apt-pkg/sourcelist.h
  69. 2
      apt-pkg/srcrecords.cc
  70. 4
      apt-pkg/srcrecords.h
  71. 46
      apt-pkg/tagfile.cc
  72. 8
      apt-pkg/tagfile.h

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

@ -406,7 +406,7 @@ class APT_HIDDEN NoActionItem : public pkgAcquire::Item /*{{{*/
APT_IGNORE_DEPRECATED_PUSH
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), d(NULL)
{
Owner->Add(this);
Status = StatIdle;
@ -662,7 +662,7 @@ std::string pkgAcquire::Item::HashSum() const /*{{{*/
pkgAcqTransactionItem::pkgAcqTransactionItem(pkgAcquire * const Owner, /*{{{*/
pkgAcqMetaBase * const transactionManager, IndexTarget const &target) :
pkgAcquire::Item(Owner), Target(target), TransactionManager(transactionManager)
pkgAcquire::Item(Owner), d(NULL), Target(target), TransactionManager(transactionManager)
{
if (TransactionManager != this)
TransactionManager->Add(this);
@ -684,7 +684,7 @@ pkgAcqMetaBase::pkgAcqMetaBase(pkgAcquire * const Owner,
std::vector<IndexTarget> const &IndexTargets,
IndexTarget const &DataTarget,
indexRecords * const MetaIndexParser)
: pkgAcqTransactionItem(Owner, TransactionManager, DataTarget),
: pkgAcqTransactionItem(Owner, TransactionManager, DataTarget), d(NULL),
MetaIndexParser(MetaIndexParser), LastMetaIndexParser(NULL), IndexTargets(IndexTargets),
AuthPass(false), IMSHit(false)
{
@ -1106,7 +1106,7 @@ pkgAcqMetaClearSig::pkgAcqMetaClearSig(pkgAcquire * const Owner, /*{{{*/
std::vector<IndexTarget> const &IndexTargets,
indexRecords * const MetaIndexParser) :
pkgAcqMetaIndex(Owner, this, ClearsignedTarget, DetachedSigTarget, IndexTargets, MetaIndexParser),
ClearsignedTarget(ClearsignedTarget),
d(NULL), ClearsignedTarget(ClearsignedTarget),
DetachedDataTarget(DetachedDataTarget)
{
// index targets + (worst case:) Release/Release.gpg
@ -1245,7 +1245,7 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire * const Owner, /*{{{*/
IndexTarget const &DetachedSigTarget,
vector<IndexTarget> const &IndexTargets,
indexRecords * const MetaIndexParser) :
pkgAcqMetaBase(Owner, TransactionManager, IndexTargets, DataTarget, MetaIndexParser),
pkgAcqMetaBase(Owner, TransactionManager, IndexTargets, DataTarget, MetaIndexParser), d(NULL),
DetachedSigTarget(DetachedSigTarget)
{
if(_config->FindB("Debug::Acquire::Transaction", false) == true)
@ -1327,7 +1327,7 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const &Target,
pkgAcqMetaIndex * const MetaIndex) :
pkgAcqTransactionItem(Owner, TransactionManager, Target), MetaIndex(MetaIndex)
pkgAcqTransactionItem(Owner, TransactionManager, Target), d(NULL), MetaIndex(MetaIndex)
{
DestFile = GetPartialFileNameFromURI(Target.URI);
@ -1489,7 +1489,7 @@ void pkgAcqMetaSig::Failed(string const &Message,pkgAcquire::MethodConfig const
pkgAcqBaseIndex::pkgAcqBaseIndex(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const &Target)
: pkgAcqTransactionItem(Owner, TransactionManager, Target)
: pkgAcqTransactionItem(Owner, TransactionManager, Target), d(NULL)
{
}
/*}}}*/
@ -1505,7 +1505,7 @@ pkgAcqBaseIndex::~pkgAcqBaseIndex() {}
pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const &Target)
: pkgAcqBaseIndex(Owner, TransactionManager, Target)
: pkgAcqBaseIndex(Owner, TransactionManager, Target), d(NULL)
{
Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
@ -1907,7 +1907,7 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const &Target,
vector<DiffInfo> const &diffs)
: pkgAcqBaseIndex(Owner, TransactionManager, Target),
: pkgAcqBaseIndex(Owner, TransactionManager, Target), d(NULL),
available_patches(diffs)
{
DestFile = GetPartialFileNameFromURI(Target.URI);
@ -2131,7 +2131,7 @@ pkgAcqIndexMergeDiffs::pkgAcqIndexMergeDiffs(pkgAcquire * const Owner,
IndexTarget const &Target,
DiffInfo const &patch,
std::vector<pkgAcqIndexMergeDiffs*> const * const allPatches)
: pkgAcqBaseIndex(Owner, TransactionManager, Target),
: pkgAcqBaseIndex(Owner, TransactionManager, Target), d(NULL),
patch(patch), allPatches(allPatches), State(StateFetchDiff)
{
Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
@ -2274,7 +2274,7 @@ pkgAcqIndexMergeDiffs::~pkgAcqIndexMergeDiffs() {}
pkgAcqIndex::pkgAcqIndex(pkgAcquire * const Owner,
pkgAcqMetaBase * const TransactionManager,
IndexTarget const &Target)
: pkgAcqBaseIndex(Owner, TransactionManager, Target), Stage(STAGE_DOWNLOAD)
: pkgAcqBaseIndex(Owner, TransactionManager, Target), d(NULL), Stage(STAGE_DOWNLOAD)
{
// autoselect the compression method
AutoSelectCompression();
@ -2555,7 +2555,7 @@ pkgAcqIndex::~pkgAcqIndex() {}
pkgAcqArchive::pkgAcqArchive(pkgAcquire * const Owner,pkgSourceList * const Sources,
pkgRecords * const Recs,pkgCache::VerIterator const &Version,
string &StoreFilename) :
Item(Owner), LocalSource(false), Version(Version), Sources(Sources), Recs(Recs),
Item(Owner), d(NULL), LocalSource(false), Version(Version), Sources(Sources), Recs(Recs),
StoreFilename(StoreFilename), Vf(Version.FileList()),
Trusted(false)
{
@ -3048,7 +3048,7 @@ pkgAcqFile::pkgAcqFile(pkgAcquire * const Owner,string const &URI, HashStringLis
unsigned long long const Size,string const &Dsc,string const &ShortDesc,
const string &DestDir, const string &DestFilename,
bool const IsIndexFile) :
Item(Owner), IsIndexFile(IsIndexFile), ExpectedHashes(Hashes)
Item(Owner), d(NULL), IsIndexFile(IsIndexFile), ExpectedHashes(Hashes)
{
Retries = _config->FindI("Acquire::Retries",0);

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

@ -336,7 +336,7 @@ class pkgAcquire::Item : public WeakPointable /*{{{*/
virtual std::string GetFinalFilename() const;
private:
void *d;
void * const d;
friend class pkgAcqMetaBase;
};
@ -344,7 +344,7 @@ class pkgAcquire::Item : public WeakPointable /*{{{*/
class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item /*{{{*/
/** \brief baseclass for the indexes files to manage them all together */
{
void *d;
void * const d;
protected:
IndexTarget const Target;
HashStringList GetExpectedHashesFor(std::string const &MetaKey) const;
@ -379,7 +379,7 @@ class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item /*{{{*/
class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem /*{{{*/
/** \brief the manager of a transaction */
{
void *d;
void * const d;
protected:
std::vector<pkgAcqTransactionItem*> Transaction;
@ -492,7 +492,7 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem /*{{{*/
*/
class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
{
void *d;
void * const d;
protected:
IndexTarget const DetachedSigTarget;
@ -527,7 +527,7 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
*/
class APT_HIDDEN pkgAcqMetaSig : public pkgAcqTransactionItem
{
void *d;
void * const d;
pkgAcqMetaIndex * const MetaIndex;
@ -556,7 +556,7 @@ class APT_HIDDEN pkgAcqMetaSig : public pkgAcqTransactionItem
/** \brief An item repsonsible for downloading clearsigned metaindexes {{{*/
class APT_HIDDEN pkgAcqMetaClearSig : public pkgAcqMetaIndex
{
void *d;
void * const d;
IndexTarget const ClearsignedTarget;
IndexTarget const DetachedDataTarget;
@ -580,7 +580,7 @@ public:
/** \brief Common base class for all classes that deal with fetching indexes {{{*/
class APT_HIDDEN pkgAcqBaseIndex : public pkgAcqTransactionItem
{
void *d;
void * const d;
public:
/** \brief Get the full pathname of the final file for the current URI */
@ -602,7 +602,7 @@ class APT_HIDDEN pkgAcqBaseIndex : public pkgAcqTransactionItem
*/
class APT_HIDDEN pkgAcqDiffIndex : public pkgAcqBaseIndex
{
void *d;
void * const d;
protected:
/** \brief If \b true, debugging information will be written to std::clog. */
@ -684,7 +684,7 @@ struct APT_HIDDEN DiffInfo { /*{{{*/
*/
class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
{
void *d;
void * const d;
protected:
@ -768,7 +768,7 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs : public pkgAcqBaseIndex
*/
class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
{
void *d;
void * const d;
private:
@ -878,7 +878,7 @@ class APT_HIDDEN pkgAcqIndexDiffs : public pkgAcqBaseIndex
*/
class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
{
void *d;
void * const d;
protected:
@ -957,7 +957,7 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
*/
class pkgAcqArchive : public pkgAcquire::Item
{
void *d;
void * const d;
bool LocalSource;
HashStringList ExpectedHashes;
@ -1045,7 +1045,7 @@ class pkgAcqArchive : public pkgAcquire::Item
*/
class pkgAcqChangelog : public pkgAcquire::Item
{
void *d;
void * const d;
std::string TemporaryDirectory;
std::string const SrcName;
std::string const SrcVersion;
@ -1160,7 +1160,7 @@ private:
*/
class pkgAcqFile : public pkgAcquire::Item
{
void *d;
void * const d;
/** \brief How many times to retry the download, set from
* Acquire::Retries.

4
apt-pkg/acquire-method.cc
View File

@ -457,7 +457,7 @@ void pkgAcqMethod::Redirect(const string &NewURI)
// ---------------------------------------------------------------------
/* */
pkgAcqMethod::FetchResult::FetchResult() : LastModified(0),
IMSHit(false), Size(0), ResumePoint(0)
IMSHit(false), Size(0), ResumePoint(0), d(NULL)
{
}
/*}}}*/
@ -480,7 +480,7 @@ void pkgAcqMethod::Dequeue() { /*{{{*/
/*}}}*/
pkgAcqMethod::~pkgAcqMethod() {}
pkgAcqMethod::FetchItem::FetchItem() {}
pkgAcqMethod::FetchItem::FetchItem() : d(NULL) {}
pkgAcqMethod::FetchItem::~FetchItem() {}
pkgAcqMethod::FetchResult::~FetchResult() {}

4
apt-pkg/acquire-method.h
View File

@ -56,7 +56,7 @@ class pkgAcqMethod
FetchItem();
virtual ~FetchItem();
private:
void *d;
void * const d;
};
struct FetchResult
@ -73,7 +73,7 @@ class pkgAcqMethod
FetchResult();
virtual ~FetchResult();
private:
void *d;
void * const d;
};
// State

13
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) : d(NULL), Log(log)
{
OwnerQ = Q;
Config = Cnf;
@ -62,15 +62,10 @@ pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf,
// Worker::Worker - Constructor for method config startup /*{{{*/
// ---------------------------------------------------------------------
/* */
pkgAcquire::Worker::Worker(MethodConfig *Cnf)
pkgAcquire::Worker::Worker(MethodConfig *Cnf) : d(NULL), OwnerQ(NULL), Config(Cnf),
Access(Cnf->Access), CurrentItem(NULL),
CurrentSize(0), TotalSize(0)
{
OwnerQ = 0;
Config = Cnf;
Access = Cnf->Access;
CurrentItem = 0;
TotalSize = 0;
CurrentSize = 0;
Construct();
}
/*}}}*/

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

@ -47,7 +47,7 @@
class pkgAcquire::Worker : public WeakPointable
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
friend class pkgAcquire;

4
apt-pkg/acquire.cc
View File

@ -51,13 +51,13 @@ using namespace std;
// Acquire::pkgAcquire - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* We grab some runtime state from the configuration space */
pkgAcquire::pkgAcquire() : LockFD(-1), Queues(0), Workers(0), Configs(0), Log(NULL), ToFetch(0),
pkgAcquire::pkgAcquire() : LockFD(-1), d(NULL), Queues(0), Workers(0), Configs(0), Log(NULL), ToFetch(0),
Debug(_config->FindB("Debug::pkgAcquire",false)),
Running(false)
{
Initialize();
}
pkgAcquire::pkgAcquire(pkgAcquireStatus *Progress) : LockFD(-1), Queues(0), Workers(0),
pkgAcquire::pkgAcquire(pkgAcquireStatus *Progress) : LockFD(-1), d(NULL), Queues(0), Workers(0),
Configs(0), Log(NULL), ToFetch(0),
Debug(_config->FindB("Debug::pkgAcquire",false)),
Running(false)

10
apt-pkg/acquire.h
View File

@ -101,7 +101,7 @@ class pkgAcquire
/** \brief FD of the Lock file we acquire in Setup (if any) */
int LockFD;
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
public:
@ -411,7 +411,7 @@ class pkgAcquire::Queue
friend class pkgAcquire::Worker;
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
/** \brief The next queue in the pkgAcquire object's list of queues. */
Queue *Next;
@ -596,7 +596,7 @@ class pkgAcquire::Queue
class pkgAcquire::UriIterator
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
/** The next queue to iterate over. */
pkgAcquire::Queue *CurQ;
@ -633,7 +633,7 @@ class pkgAcquire::UriIterator
struct pkgAcquire::MethodConfig
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
/** \brief The next link on the acquire method list.
*
@ -694,7 +694,7 @@ struct pkgAcquire::MethodConfig
class pkgAcquireStatus
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
protected:

2
apt-pkg/algorithms.cc
View File

@ -43,7 +43,7 @@ pkgProblemResolver *pkgProblemResolver::This = 0;
/* The legacy translations here of input Pkg iterators is obsolete,
this is not necessary since the pkgCaches are fully shared now. */
pkgSimulate::pkgSimulate(pkgDepCache *Cache) : pkgPackageManager(Cache),
iPolicy(Cache),
d(NULL), iPolicy(Cache),
Sim(&Cache->GetCache(),&iPolicy),
group(Sim)
{

4
apt-pkg/algorithms.h
View File

@ -54,7 +54,7 @@ using std::ostream;
class pkgSimulate : public pkgPackageManager /*{{{*/
{
void *d;
void * const d;
protected:
class Policy : public pkgDepCache::Policy
@ -95,7 +95,7 @@ class pkgProblemResolver /*{{{*/
{
private:
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
pkgDepCache &Cache;
typedef pkgCache::PkgIterator PkgIterator;

2
apt-pkg/cachefile.h
View File

@ -37,7 +37,7 @@ class OpProgress;
class pkgCacheFile
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
protected:

19
apt-pkg/cacheset.cc
View File

@ -813,16 +813,25 @@ APT_CONST void CacheSetHelper::showSelectedVersion(pkgCache::PkgIterator const &
/*}}}*/
CacheSetHelper::CacheSetHelper(bool const ShowError, GlobalError::MsgType ErrorType) :
ShowError(ShowError), ErrorType(ErrorType) {}
ShowError(ShowError), ErrorType(ErrorType), d(NULL) {}
CacheSetHelper::~CacheSetHelper() {}
PackageContainerInterface::PackageContainerInterface() : ConstructedBy(CacheSetHelper::UNKNOWN) {}
PackageContainerInterface::PackageContainerInterface(CacheSetHelper::PkgSelector const by) : ConstructedBy(by) {}
PackageContainerInterface::PackageContainerInterface() : ConstructedBy(CacheSetHelper::UNKNOWN), d(NULL) {}
PackageContainerInterface::PackageContainerInterface(CacheSetHelper::PkgSelector const by) : ConstructedBy(by), d(NULL) {}
PackageContainerInterface& PackageContainerInterface::operator=(PackageContainerInterface const &other) {
if (this != &other)
this->ConstructedBy = other.ConstructedBy;
return *this;
}
PackageContainerInterface::~PackageContainerInterface() {}
PackageUniverse::PackageUniverse(pkgCache * const Owner) : _cont(Owner) { }
PackageUniverse::PackageUniverse(pkgCache * const Owner) : _cont(Owner), d(NULL) { }
PackageUniverse::~PackageUniverse() {}
VersionContainerInterface::VersionContainerInterface() {}
VersionContainerInterface::VersionContainerInterface() : d(NULL) {}
VersionContainerInterface& VersionContainerInterface::operator=(VersionContainerInterface const &) {
return *this;
}
VersionContainerInterface::~VersionContainerInterface() {}
}

10
apt-pkg/cacheset.h
View File

@ -203,7 +203,7 @@ protected:
bool PackageFromPackageName(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern);
bool PackageFromString(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string const &pattern);
private:
void *d;
void * const d;
}; /*}}}*/
class PackageContainerInterface { /*{{{*/
@ -266,6 +266,7 @@ APT_IGNORE_DEPRECATED_POP
CacheSetHelper::PkgSelector getConstructor() const { return ConstructedBy; }
PackageContainerInterface();
explicit PackageContainerInterface(CacheSetHelper::PkgSelector const by);
PackageContainerInterface& operator=(PackageContainerInterface const &other);
virtual ~PackageContainerInterface();
APT_DEPRECATED static bool FromTask(PackageContainerInterface * const pci, pkgCacheFile &Cache, std::string pattern, CacheSetHelper &helper) {
@ -294,7 +295,7 @@ APT_IGNORE_DEPRECATED_POP
private:
CacheSetHelper::PkgSelector ConstructedBy;
void *d;
void * const d;
};
/*}}}*/
template<class Container> class PackageContainer : public PackageContainerInterface {/*{{{*/
@ -555,7 +556,7 @@ template<> template<class Compare> inline bool PackageContainer<std::vector<pkgC
private methods. */
class APT_HIDDEN PackageUniverse : public PackageContainerInterface {
pkgCache * const _cont;
void *d;
void * const d;
public:
typedef pkgCache::PkgIterator iterator;
typedef pkgCache::PkgIterator const_iterator;
@ -707,9 +708,10 @@ APT_IGNORE_DEPRECATED_PUSH
APT_IGNORE_DEPRECATED_POP
VersionContainerInterface();
VersionContainerInterface& operator=(VersionContainerInterface const &other);
virtual ~VersionContainerInterface();
private:
void *d;
void * const d;
protected: /*{{{*/

6
apt-pkg/cdrom.cc
View File

@ -917,7 +917,7 @@ bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/
}
/*}}}*/
pkgUdevCdromDevices::pkgUdevCdromDevices() /*{{{*/
: libudev_handle(NULL), udev_new(NULL), udev_enumerate_add_match_property(NULL),
: d(NULL), libudev_handle(NULL), udev_new(NULL), udev_enumerate_add_match_property(NULL),
udev_enumerate_scan_devices(NULL), udev_enumerate_get_list_entry(NULL),
udev_device_new_from_syspath(NULL), udev_enumerate_get_udev(NULL),
udev_list_entry_get_name(NULL), udev_device_get_devnode(NULL),
@ -1023,8 +1023,8 @@ pkgUdevCdromDevices::~pkgUdevCdromDevices() /*{{{*/
}
/*}}}*/
pkgCdromStatus::pkgCdromStatus() : totalSteps(0) {}
pkgCdromStatus::pkgCdromStatus() : d(NULL), totalSteps(0) {}
pkgCdromStatus::~pkgCdromStatus() {}
pkgCdrom::pkgCdrom() {}
pkgCdrom::pkgCdrom() : d(NULL) {}
pkgCdrom::~pkgCdrom() {}

6
apt-pkg/cdrom.h
View File

@ -18,7 +18,7 @@ class OpProgress;
class pkgCdromStatus /*{{{*/
{
void *d;
void * const d;
protected:
int totalSteps;
@ -79,7 +79,7 @@ class pkgCdrom /*{{{*/
virtual ~pkgCdrom();
private:
void *d;
void * const d;
APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
std::string &ident, pkgCdromStatus * const log, bool const interactive);
@ -98,7 +98,7 @@ struct CdromDevice /*{{{*/
/*}}}*/
class pkgUdevCdromDevices /*{{{*/
{
void *d;
void * const d;
protected:
// libudev dlopen structure
void *libudev_handle;

2
apt-pkg/clean.cc
View File

@ -132,5 +132,5 @@ bool pkgArchiveCleaner::Go(std::string Dir,pkgCache &Cache)
}
/*}}}*/
pkgArchiveCleaner::pkgArchiveCleaner() {}
pkgArchiveCleaner::pkgArchiveCleaner() : d(NULL) {}
APT_CONST pkgArchiveCleaner::~pkgArchiveCleaner() {}

2
apt-pkg/clean.h
View File

@ -21,7 +21,7 @@ class pkgCache;
class pkgArchiveCleaner
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
protected:

19
apt-pkg/contrib/fileutl.cc
View File

@ -1011,6 +1011,25 @@ class FileFdPrivate { /*{{{*/
~FileFdPrivate() { CloseDown(""); }
};
/*}}}*/
// FileFd Constructors /*{{{*/
FileFd::FileFd(std::string FileName,unsigned int const Mode,unsigned long AccessMode) : iFd(-1), Flags(0), d(NULL)
{
Open(FileName,Mode, None, AccessMode);
}
FileFd::FileFd(std::string FileName,unsigned int const Mode, CompressMode Compress, unsigned long AccessMode) : iFd(-1), Flags(0), d(NULL)
{
Open(FileName,Mode, Compress, AccessMode);
}
FileFd::FileFd() : iFd(-1), Flags(AutoClose), d(NULL) {}
FileFd::FileFd(int const Fd, unsigned int const Mode, CompressMode Compress) : iFd(-1), Flags(0), d(NULL)
{
OpenDescriptor(Fd, Mode, Compress);
}
FileFd::FileFd(int const Fd, bool const AutoClose) : iFd(-1), Flags(0), d(NULL)
{
OpenDescriptor(Fd, ReadWrite, None, AutoClose);
}
/*}}}*/
// FileFd::Open - Open a file /*{{{*/
// ---------------------------------------------------------------------
/* The most commonly used open mode combinations are given with Mode */

27
apt-pkg/contrib/fileutl.h
View File

@ -130,28 +130,17 @@ class FileFd
inline bool Eof() {return (Flags & HitEof) == HitEof;};
inline bool IsCompressed() {return (Flags & Compressed) == Compressed;};
inline std::string &Name() {return FileName;};
FileFd(std::string FileName,unsigned int const Mode,unsigned long AccessMode = 0666) : iFd(-1), Flags(0), d(NULL)
{
Open(FileName,Mode, None, AccessMode);
};
FileFd(std::string FileName,unsigned int const Mode, CompressMode Compress, unsigned long AccessMode = 0666) : iFd(-1), Flags(0), d(NULL)
{
Open(FileName,Mode, Compress, AccessMode);
};
FileFd() : iFd(-1), Flags(AutoClose), d(NULL) {};
FileFd(int const Fd, unsigned int const Mode = ReadWrite, CompressMode Compress = None) : iFd(-1), Flags(0), d(NULL)
{
OpenDescriptor(Fd, Mode, Compress);
};
FileFd(int const Fd, bool const AutoClose) : iFd(-1), Flags(0), d(NULL)
{
OpenDescriptor(Fd, ReadWrite, None, AutoClose);
};
FileFd(std::string FileName,unsigned int const Mode,unsigned long AccessMode = 0666);
FileFd(std::string FileName,unsigned int const Mode, CompressMode Compress, unsigned long AccessMode = 0666);
FileFd();
FileFd(int const Fd, unsigned int const Mode = ReadWrite, CompressMode Compress = None);
FileFd(int const Fd, bool const AutoClose);
virtual ~FileFd();
private:
FileFdPrivate* d;
FileFdPrivate * d;
APT_HIDDEN FileFd & operator=(const FileFd &);
APT_HIDDEN bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor);
// private helpers to set Fail flag and call _error->Error

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

@ -277,6 +277,18 @@ public:
unsigned int CalcHashes;
explicit PrivateHashes(unsigned int const CalcHashes) : FileSize(0), CalcHashes(CalcHashes) {}
explicit PrivateHashes(HashStringList const &Hashes) : FileSize(0) {
unsigned int calcHashes = Hashes.usable() ? 0 : ~0;
if (Hashes.find("MD5Sum") != NULL)
calcHashes |= Hashes::MD5SUM;
if (Hashes.find("SHA1") != NULL)
calcHashes |= Hashes::SHA1SUM;
if (Hashes.find("SHA256") != NULL)
calcHashes |= Hashes::SHA256SUM;
if (Hashes.find("SHA512") != NULL)
calcHashes |= Hashes::SHA512SUM;
CalcHashes = calcHashes;
}
};
/*}}}*/
// Hashes::Add* - Add the contents of data or FD /*{{{*/
@ -372,19 +384,8 @@ APT_IGNORE_DEPRECATED_POP
return hashes;
}
APT_IGNORE_DEPRECATED_PUSH
Hashes::Hashes() { d = new PrivateHashes(~0); }
Hashes::Hashes(unsigned int const Hashes) { d = new PrivateHashes(Hashes); }
Hashes::Hashes(HashStringList const &Hashes) {
unsigned int calcHashes = Hashes.usable() ? 0 : ~0;
if (Hashes.find("MD5Sum") != NULL)
calcHashes |= MD5SUM;
if (Hashes.find("SHA1") != NULL)
calcHashes |= SHA1SUM;
if (Hashes.find("SHA256") != NULL)
calcHashes |= SHA256SUM;
if (Hashes.find("SHA512") != NULL)
calcHashes |= SHA512SUM;
d = new PrivateHashes(calcHashes);
}
Hashes::Hashes() : d(new PrivateHashes(~0)) { }
Hashes::Hashes(unsigned int const Hashes) : d(new PrivateHashes(Hashes)) {}
Hashes::Hashes(HashStringList const &Hashes) : d(new PrivateHashes(Hashes)) {}
Hashes::~Hashes() { delete d; }
APT_IGNORE_DEPRECATED_POP

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

@ -182,7 +182,7 @@ class HashStringList
class PrivateHashes;
class Hashes
{
PrivateHashes *d;
PrivateHashes * const d;
public:
/* those will disappear in the future as it is hard to add new ones this way.

12
apt-pkg/deb/debindexfile.cc
View File

@ -45,7 +45,7 @@ using std::string;
// ---------------------------------------------------------------------
/* */
debSourcesIndex::debSourcesIndex(IndexTarget const &Target,bool const Trusted) :
pkgIndexTargetFile(Target, Trusted)
pkgIndexTargetFile(Target, Trusted), d(NULL)
{
}
/*}}}*/
@ -84,7 +84,7 @@ pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const
// ---------------------------------------------------------------------
/* */
debPackagesIndex::debPackagesIndex(IndexTarget const &Target, bool const Trusted) :
pkgIndexTargetFile(Target, Trusted)
pkgIndexTargetFile(Target, Trusted), d(NULL)
{
}
/*}}}*/
@ -179,7 +179,7 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
// TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/
debTranslationsIndex::debTranslationsIndex(IndexTarget const &Target) :
pkgIndexTargetFile(Target, true)
pkgIndexTargetFile(Target, true), d(NULL)
{}
/*}}}*/
bool debTranslationsIndex::HasPackages() const /*{{{*/
@ -255,7 +255,7 @@ pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) con
// StatusIndex::debStatusIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
debStatusIndex::debStatusIndex(string File) : pkgIndexFile(true), File(File)
debStatusIndex::debStatusIndex(string File) : pkgIndexFile(true), d(NULL), File(File)
{
}
/*}}}*/
@ -341,7 +341,7 @@ APT_CONST bool debStatusIndex::Exists() const
// debDebPkgFile - Single .deb file /*{{{*/
debDebPkgFileIndex::debDebPkgFileIndex(std::string DebFile)
: pkgIndexFile(true), DebFile(DebFile)
: pkgIndexFile(true), d(NULL), DebFile(DebFile)
{
DebFileFullPath = flAbsPath(DebFile);
}
@ -445,7 +445,7 @@ unsigned long debDebPkgFileIndex::Size() const
// debDscFileIndex stuff
debDscFileIndex::debDscFileIndex(std::string &DscFile)
: pkgIndexFile(true), DscFile(DscFile)
: pkgIndexFile(true), d(NULL), DscFile(DscFile)
{
}

12
apt-pkg/deb/debindexfile.h
View File

@ -29,7 +29,7 @@ class pkgCacheGenerator;
class APT_HIDDEN debStatusIndex : public pkgIndexFile
{
void *d;
void * const d;
protected:
std::string File;
@ -53,7 +53,7 @@ class APT_HIDDEN debStatusIndex : public pkgIndexFile
class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
{
void *d;
void * const d;
public:
virtual const Type *GetType() const APT_CONST;
@ -72,7 +72,7 @@ class APT_HIDDEN debPackagesIndex : public pkgIndexTargetFile
class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
{
void *d;
void * const d;
public:
virtual const Type *GetType() const APT_CONST;
@ -88,7 +88,7 @@ class APT_HIDDEN debTranslationsIndex : public pkgIndexTargetFile
class APT_HIDDEN debSourcesIndex : public pkgIndexTargetFile
{
void *d;
void * const d;
public:
virtual const Type *GetType() const APT_CONST;
@ -110,7 +110,7 @@ class APT_HIDDEN debSourcesIndex : public pkgIndexTargetFile
class APT_HIDDEN debDebPkgFileIndex : public pkgIndexFile
{
private:
void *d;
void * const d;
std::string DebFile;
std::string DebFileFullPath;
@ -148,7 +148,7 @@ class APT_HIDDEN debDebPkgFileIndex : public pkgIndexFile
class APT_HIDDEN debDscFileIndex : public pkgIndexFile
{
private:
void *d;
void * const d;
std::string DscFile;
public:
virtual const Type *GetType() const APT_CONST;

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

@ -50,7 +50,7 @@ static debListParser::WordList PrioList[] = {
/* Provide an architecture and only this one and "all" will be accepted
in Step(), if no Architecture is given we will accept every arch
we would accept in general with checkArchitecture() */
debListParser::debListParser(FileFd *File, string const &Arch) : Tags(File),
debListParser::debListParser(FileFd *File, string const &Arch) : d(NULL), Tags(File),
Arch(Arch) {
if (Arch == "native")
this->Arch = _config->Find("APT::Architecture");

2
apt-pkg/deb/deblistparser.h
View File

@ -39,7 +39,7 @@ class APT_HIDDEN debListParser : public pkgCacheGenerator::ListParser
private:
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
protected:
pkgTagFile Tags;

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

@ -86,11 +86,11 @@ std::string debReleaseIndex::LocalFileName() const
}
debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist) :
metaIndex(URI, Dist, "deb"), Trusted(CHECK_TRUST)
metaIndex(URI, Dist, "deb"), d(NULL), Trusted(CHECK_TRUST)
{}
debReleaseIndex::debReleaseIndex(string const &URI, string const &Dist, bool const Trusted) :
metaIndex(URI, Dist, "deb") {
metaIndex(URI, Dist, "deb"), d(NULL) {
SetTrusted(Trusted);
}
@ -541,7 +541,7 @@ class APT_HIDDEN debSLTypeDebian : public pkgSourceList::Type
};
debDebFileMetaIndex::debDebFileMetaIndex(std::string const &DebFile)
: metaIndex(DebFile, "local-uri", "deb-dist"), DebFile(DebFile)
: metaIndex(DebFile, "local-uri", "deb-dist"), d(NULL), DebFile(DebFile)
{
DebIndex = new debDebPkgFileIndex(DebFile);
Indexes = new vector<pkgIndexFile *>();

4
apt-pkg/deb/debmetaindex.h
View File

@ -36,7 +36,7 @@ class APT_HIDDEN debReleaseIndex : public metaIndex {
private:
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
std::map<std::string, std::vector<debSectionEntry const*> > ArchEntries;
enum APT_HIDDEN { ALWAYS_TRUSTED, NEVER_TRUSTED, CHECK_TRUST } Trusted;
@ -75,7 +75,7 @@ class APT_HIDDEN debReleaseIndex : public metaIndex {
class APT_HIDDEN debDebFileMetaIndex : public metaIndex
{
private:
void *d;
void * const d;
std::string DebFile;
debDebPkgFileIndex *DebIndex;
public:

6
apt-pkg/deb/debrecords.cc
View File

@ -34,7 +34,7 @@ using std::string;
// RecordParser::debRecordParser - Constructor /*{{{*/
debRecordParser::debRecordParser(string FileName,pkgCache &Cache) :
debRecordParserBase(), File(FileName, FileFd::ReadOnly, FileFd::Extension),
debRecordParserBase(), d(NULL), File(FileName, FileFd::ReadOnly, FileFd::Extension),
Tags(&File, std::max(Cache.Head().MaxVerFileSize, Cache.Head().MaxDescFileSize) + 200)
{
}
@ -51,7 +51,7 @@ bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
/*}}}*/
debRecordParser::~debRecordParser() {}
debRecordParserBase::debRecordParserBase() : Parser() {}
debRecordParserBase::debRecordParserBase() : Parser(), d(NULL) {}
// RecordParserBase::FileName - Return the archive filename on the site /*{{{*/
string debRecordParserBase::FileName()
{
@ -212,5 +212,5 @@ bool debDebFileRecordParser::Jump(pkgCache::VerFileIterator const &) { return Lo
bool debDebFileRecordParser::Jump(pkgCache::DescFileIterator const &) { return LoadContent(); }
std::string debDebFileRecordParser::FileName() { return debFileName; }
debDebFileRecordParser::debDebFileRecordParser(std::string FileName) : debRecordParserBase(), debFileName(FileName) {}
debDebFileRecordParser::debDebFileRecordParser(std::string FileName) : debRecordParserBase(), d(NULL), debFileName(FileName) {}
debDebFileRecordParser::~debDebFileRecordParser() {}

6
apt-pkg/deb/debrecords.h
View File

@ -27,7 +27,7 @@
class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
{
void *d;
void * const d;
protected:
pkgTagSection Section;
@ -57,7 +57,7 @@ class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
class APT_HIDDEN debRecordParser : public debRecordParserBase
{
void *d;
void * const d;
protected:
FileFd File;
pkgTagFile Tags;
@ -73,7 +73,7 @@ class APT_HIDDEN debRecordParser : public debRecordParserBase
// custom record parser that reads deb files directly
class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase
{
void *d;
void * const d;
std::string debFileName;
std::string controlContent;

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

@ -33,7 +33,7 @@ using std::max;
using std::string;
debSrcRecordParser::debSrcRecordParser(std::string const &File,pkgIndexFile const *Index)
: Parser(Index), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
: Parser(Index), d(NULL), Fd(File,FileFd::ReadOnly, FileFd::Extension), Tags(&Fd,102400),
iOffset(0), Buffer(NULL) {}
// SrcRecordParser::Binaries - Return the binaries field /*{{{*/

2
apt-pkg/deb/debsrcrecords.h
View File

@ -24,7 +24,7 @@ class pkgIndexFile;
class APT_HIDDEN debSrcRecordParser : public pkgSrcRecords::Parser
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
protected:
FileFd Fd;

5
apt-pkg/deb/debsystem.cc
View File

@ -53,11 +53,8 @@ public:
// System::debSystem - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
debSystem::debSystem()
debSystem::debSystem() : pkgSystem("Debian dpkg interface", &debVS), d(new debSystemPrivate())
{
d = new debSystemPrivate();
Label = "Debian dpkg interface";
VS = &debVS;
}
/*}}}*/
// System::~debSystem - Destructor /*{{{*/

2
apt-pkg/deb/debsystem.h
View File

@ -28,7 +28,7 @@ class debStatusIndex;
class debSystem : public pkgSystem
{
// private d-pointer
debSystemPrivate *d;
debSystemPrivate * const d;
APT_HIDDEN bool CheckUpdates();
public:

5
apt-pkg/deb/dpkgpm.cc
View File

@ -216,10 +216,9 @@ pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg)
// DPkgPM::pkgDPkgPM - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache)
: pkgPackageManager(Cache), pkgFailures(0), PackagesDone(0), PackagesTotal(0)
pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache)
: pkgPackageManager(Cache),d(new pkgDPkgPMPrivate()), pkgFailures(0), PackagesDone(0), PackagesTotal(0)
{
d = new pkgDPkgPMPrivate();
}
/*}}}*/
// DPkgPM::pkgDPkgPM - Destructor /*{{{*/

2
apt-pkg/deb/dpkgpm.h
View File

@ -37,7 +37,7 @@ class pkgDPkgPMPrivate;
class pkgDPkgPM : public pkgPackageManager
{
private:
pkgDPkgPMPrivate *d;
pkgDPkgPMPrivate * const d;
/** \brief record the disappear action and handle accordingly

4
apt-pkg/depcache.cc
View File

@ -63,7 +63,7 @@ ConfigValueInSubTree(const char* SubTree, const char *needle)
}
/*}}}*/
pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) : /*{{{*/
cache(cache), released(false)
d(NULL), cache(cache), released(false)
{
++cache.group_level;
}
@ -97,7 +97,7 @@ pkgDepCache::ActionGroup::~ActionGroup()
pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) :
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)
iBrokenCount(0), iPolicyBrokenCount(0), iBadCount(0), d(NULL)
{
DebugMarker = _config->FindB("Debug::pkgDepCache::Marker", false);
DebugAutoInstall = _config->FindB("Debug::pkgDepCache::AutoInstall", false);

4
apt-pkg/depcache.h
View File

@ -163,7 +163,7 @@ class pkgDepCache : protected pkgCache::Namespace
*/
class ActionGroup
{
void *d;
void * const d;
pkgDepCache &cache;
bool released;
@ -503,7 +503,7 @@ class pkgDepCache : protected pkgCache::Namespace
bool const rPurge, unsigned long const Depth, bool const FromUser);
private:
void *d;
void * const d;
APT_HIDDEN bool IsModeChangeOk(ModeList const mode, PkgIterator const &Pkg,
unsigned long const Depth, bool const FromUser);

2
apt-pkg/edsp/edspindexfile.cc
View File

@ -29,7 +29,7 @@
// edspIndex::edspIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
edspIndex::edspIndex(std::string File) : debStatusIndex(File)
edspIndex::edspIndex(std::string File) : debStatusIndex(File), d(NULL)
{
}
/*}}}*/

2
apt-pkg/edsp/edspindexfile.h
View File

@ -21,7 +21,7 @@ class pkgCacheGenerator;
class APT_HIDDEN edspIndex : public debStatusIndex
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
public:

2
apt-pkg/edsp/edsplistparser.cc
View File

@ -22,7 +22,7 @@
/*}}}*/
// ListParser::edspListParser - Constructor /*{{{*/
edspListParser::edspListParser(FileFd *File, std::string const &Arch) : debListParser(File, Arch)
edspListParser::edspListParser(FileFd *File, std::string const &Arch) : debListParser(File, Arch), d(NULL)
{}
/*}}}*/
// ListParser::NewVersion - Fill in the version structure /*{{{*/

2
apt-pkg/edsp/edsplistparser.h
View File

@ -27,7 +27,7 @@ class FileFd;
class APT_HIDDEN edspListParser : public debListParser
{
void *d;
void * const d;
public:
virtual bool NewVersion(pkgCache::VerIterator &Ver);
virtual std::string Description();

8
apt-pkg/edsp/edspsystem.cc
View File

@ -26,13 +26,9 @@
#include <apti18n.h>
/*}}}*/
// System::debSystem - Constructor /*{{{*/
edspSystem::edspSystem()
// System::edspSystem - Constructor /*{{{*/
edspSystem::edspSystem() : pkgSystem("Debian APT solver interface", &debVS), d(NULL), StatusFile(NULL)
{
StatusFile = 0;
Label = "Debian APT solver interface";
VS = &debVS;
}
/*}}}*/
// System::~debSystem - Destructor /*{{{*/

2
apt-pkg/edsp/edspsystem.h
View File

@ -25,7 +25,7 @@ class edspIndex;
class APT_HIDDEN edspSystem : public pkgSystem
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
edspIndex *StatusFile;

10
apt-pkg/indexcopy.cc
View File

@ -769,14 +769,14 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/
}
/*}}}*/
IndexCopy::IndexCopy() {}
IndexCopy::IndexCopy() : d(NULL) {}
APT_CONST IndexCopy::~IndexCopy() {}
PackageCopy::PackageCopy() : IndexCopy() {}
PackageCopy::PackageCopy() : IndexCopy(), d(NULL) {}
APT_CONST PackageCopy::~PackageCopy() {}
SourceCopy::SourceCopy() : IndexCopy() {}
SourceCopy::SourceCopy() : IndexCopy(), d(NULL) {}
APT_CONST SourceCopy::~SourceCopy() {}
TranslationsCopy::TranslationsCopy() {}
TranslationsCopy::TranslationsCopy() : d(NULL) {}
APT_CONST TranslationsCopy::~TranslationsCopy() {}
SigVerify::SigVerify() {}
SigVerify::SigVerify() : d(NULL) {}
APT_CONST SigVerify::~SigVerify() {}

10
apt-pkg/indexcopy.h
View File

@ -32,7 +32,7 @@ class FileFd;
class IndexCopy /*{{{*/
{
/** \brief dpointer placeholder (for later in case we need it) */
void *d;
void * const d;
protected:
@ -59,7 +59,7 @@ class IndexCopy /*{{{*/
/*}}}*/
class PackageCopy : public IndexCopy /*{{{*/
{
void *d;
void * const d;
protected:
virtual bool GetFile(std::string &Filename,unsigned long long &Size);
@ -74,7 +74,7 @@ class PackageCopy : public IndexCopy /*{{{*/
/*}}}*/
class SourceCopy : public IndexCopy /*{{{*/
{
void *d;
void * const d;
protected:
virtual bool GetFile(std::string &Filename,unsigned long long &Size);
@ -89,7 +89,7 @@ class SourceCopy : public IndexCopy /*{{{*/
/*}}}*/
class TranslationsCopy /*{{{*/
{
void *d;
void * const d;
protected: