diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-08-03 19:24:22 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-08-03 19:24:22 +0200 |
| commit | 04b38410e88705c26f191ca654cb89ab91c866ad (patch) | |
| tree | f79ef1a04932ccfca26f8398d73df858c198806b /apt-pkg | |
| parent | 8ecd1fedeace0e22f96259e250094006c673d065 (diff) | |
| parent | 4b7c5a3fe8e3dfc439fdad88f30e28964059a5e4 (diff) | |
* merged from apt--mvo
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/cdrom.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 7 | ||||
| -rw-r--r-- | apt-pkg/deb/dpkgpm.h | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 4a688a5e1..96106c7a9 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -668,8 +668,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) DropRepeats(TransList,""); if(log) { msg.str(""); - ioprintf(msg, _("Found %i package indexes, %i source indexes, " - "%i translation indexes and %i signatures\n"), + ioprintf(msg, _("Found %lu package indexes, %lu source indexes, " + "%lu translation indexes and %lu signatures\n"), List.size(), SourceList.size(), TransList.size(), SigList.size()); log->Update(msg.str(), STEP_SCAN); 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 { |