From 4b7c5a3fe8e3dfc439fdad88f30e28964059a5e4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Aug 2007 18:59:39 +0200 Subject: * make apt -Wall clean --- apt-pkg/deb/dpkgpm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg/deb/dpkgpm.h') 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 PackageOpsDone; + map PackageOpsDone; // progress reporting - int PackagesDone; - int PackagesTotal; + unsigned int PackagesDone; + unsigned int PackagesTotal; struct Item { -- cgit v1.2.3 From 1ba381717c81d4a06091ab1ededf70af55801b19 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 6 Aug 2007 15:41:32 +0200 Subject: * apt-pkg/deb/dpkgpm.{cc,h}: move term_out into DPkgPM class --- apt-pkg/deb/dpkgpm.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apt-pkg/deb/dpkgpm.h') diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 065c6c917..448091626 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -26,7 +26,8 @@ class pkgDPkgPM : public pkgPackageManager // the buffer we use for the dpkg status-fd reading char dpkgbuf[1024]; int dpkgbuf_pos; - + FILE *term_out; + protected: // progress reporting @@ -67,7 +68,7 @@ class pkgDPkgPM : public pkgPackageManager // input processing void DoStdin(int master); - void DoTerminalPty(int master, FILE *out); + void DoTerminalPty(int master); void DoDpkgStatusFd(int statusfd, int OutStatusFd); void ProcessDpkgStatusLine(int OutStatusFd, char *line); -- cgit v1.2.3