From 2651f1c071927b7fc440ec7a638ecad7ccf04a2e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 25 Jan 2016 22:13:52 +0100 Subject: act on various suggestions from cppcheck Reported-By: cppcheck Git-Dch: Ignore --- apt-pkg/acquire-worker.cc | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'apt-pkg/acquire-worker.cc') diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index c2ee8cda3..37804c67a 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -42,29 +42,16 @@ using namespace std; // Worker::Worker - Constructor for Queue startup /*{{{*/ -// --------------------------------------------------------------------- -/* */ -pkgAcquire::Worker::Worker(Queue *Q,MethodConfig *Cnf, - pkgAcquireStatus *log) : d(NULL), Log(log) +pkgAcquire::Worker::Worker(Queue *Q, MethodConfig *Cnf, pkgAcquireStatus *log) : + d(NULL), OwnerQ(Q), Log(log), Config(Cnf), Access(Cnf->Access), + CurrentItem(nullptr), CurrentSize(0), TotalSize(0) { - OwnerQ = Q; - Config = Cnf; - Access = Cnf->Access; - CurrentItem = 0; - TotalSize = 0; - CurrentSize = 0; - Construct(); } /*}}}*/ // Worker::Worker - Constructor for method config startup /*{{{*/ -// --------------------------------------------------------------------- -/* */ -pkgAcquire::Worker::Worker(MethodConfig *Cnf) : d(NULL), OwnerQ(NULL), Config(Cnf), - Access(Cnf->Access), CurrentItem(NULL), - CurrentSize(0), TotalSize(0) +pkgAcquire::Worker::Worker(MethodConfig *Cnf) : Worker(nullptr, Cnf, nullptr) { - Construct(); } /*}}}*/ // Worker::Construct - Constructor helper /*{{{*/ -- cgit v1.2.3