summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-08-03 18:59:39 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-08-03 18:59:39 +0200
commit4b7c5a3fe8e3dfc439fdad88f30e28964059a5e4 (patch)
treedd1a6b69ebe429fd76d089438622073887cf1898 /apt-pkg/deb
parentb7f9f8fc3c7dc452e457bfd8ba51b198b6c29960 (diff)
* make apt -Wall clean
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/dpkgpm.cc5
-rw-r--r--apt-pkg/deb/dpkgpm.h6
2 files changed, 4 insertions, 7 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 94215197c..168c31483 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -43,7 +43,7 @@ using namespace std;
// ---------------------------------------------------------------------
/* */
pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache)
- : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesTotal(0), PackagesDone(0)
+ : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesDone(0), PackagesTotal(0)
{
}
/*}}}*/
@@ -770,9 +770,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 c552b20c9..065c6c917 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -43,10 +43,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
{