summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-08-03 19:24:22 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-08-03 19:24:22 +0200
commit04b38410e88705c26f191ca654cb89ab91c866ad (patch)
treef79ef1a04932ccfca26f8398d73df858c198806b /apt-pkg/deb
parent8ecd1fedeace0e22f96259e250094006c673d065 (diff)
parent4b7c5a3fe8e3dfc439fdad88f30e28964059a5e4 (diff)
* merged from apt--mvo
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc7
-rw-r--r--apt-pkg/deb/dpkgpm.h6
2 files changed, 5 insertions, 8 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 6cb444ef1..de84ba96a 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -44,8 +44,8 @@ using namespace std;
// ---------------------------------------------------------------------
/* */
pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache)
- : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesTotal(0),
- PackagesDone(0), term_out(NULL)
+ : pkgPackageManager(Cache), dpkgbuf_pos(0),
+ PackagesTotal(0), PackagesDone(0), term_out(NULL)
{
}
/*}}}*/
@@ -773,9 +773,6 @@ bool pkgDPkgPM::Go(int OutStatusFd)
int _dpkgin = fd[0];
close(fd[1]); // close the write end of the pipe
- // the read buffers for the communication with dpkg
- char buf[2] = {0,0};
-
// the result of the waitpid call
int res;
close(slave);
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 222add98f..debde36a3 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -45,10 +45,10 @@ class pkgDPkgPM : public pkgPackageManager
// the dpkg states that are already done; the string is the package
// the int is the state that is already done (e.g. a package that is
// going to be install is already in state "half-installed")
- map<string,int> PackageOpsDone;
+ map<string,unsigned int> PackageOpsDone;
// progress reporting
- int PackagesDone;
- int PackagesTotal;
+ unsigned int PackagesDone;
+ unsigned int PackagesTotal;
struct Item
{