diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-03-13 14:03:42 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-03-13 14:03:42 +0100 |
commit | 86a3007a2211d18444e1a0080e9c645c77d84008 (patch) | |
tree | f346f330efda8696b97fafc2e8b0744748de66b7 /cmdline | |
parent | af20242585a0b4880484c5559edb7d14962918ce (diff) | |
parent | c872b88e8254304dc1f6f1ee421cfbf9c1d0643e (diff) |
cherry pick a bunch of packagemanager.cc ordering fixes
Diffstat (limited to 'cmdline')
-rw-r--r-- | cmdline/acqprogress.cc | 3 | ||||
-rw-r--r-- | cmdline/apt-extracttemplates.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index 1ccb08804..3ac350aca 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -31,8 +31,9 @@ using namespace std; // --------------------------------------------------------------------- /* */ AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) : - ScreenWidth(ScreenWidth), Quiet(Quiet) + ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet) { + BlankLine[0] = 0; } /*}}}*/ // AcqTextStatus::Start - Downloading has started /*{{{*/ diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index d5c1a3208..dc4c110a1 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -53,8 +53,8 @@ pkgCache *DebFile::Cache = 0; // --------------------------------------------------------------------- /* */ DebFile::DebFile(const char *debfile) - : File(debfile, FileFd::ReadOnly), Control(0), DepOp(0), - PreDepOp(0), Config(0), Template(0), Which(None) + : File(debfile, FileFd::ReadOnly), Size(0), Control(NULL), ControlLen(0), + DepOp(0), PreDepOp(0), Config(0), Template(0), Which(None) { } /*}}}*/ |