From a376d6fdfe2f01cddd980fb14f53a3d4580d4779 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 27 Dec 2007 15:04:42 -0200 Subject: * Fix compilation warnings in apt-pkg/cdrom.cc and apt-pkg/contrib/configuration.cc. --- apt-pkg/cdrom.cc | 4 ++-- apt-pkg/contrib/configuration.cc | 2 +- debian/changelog | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 0cbdc178f..370687f24 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -675,8 +675,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log) DropRepeats(TransList,""); if(log) { msg.str(""); - ioprintf(msg, _("Found %u package indexes, %u source indexes, " - "%u translation indexes and %u signatures\n"), + ioprintf(msg, _("Found %zu package indexes, %zu source indexes, " + "%zu translation indexes and %zu signatures\n"), List.size(), SourceList.size(), TransList.size(), SigList.size()); log->Update(msg.str(), STEP_SCAN); diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index e8301d918..da57c2054 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -512,7 +512,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, CurLine++; // This should be made to work instead, but this is better than looping if (F.fail() && !F.eof()) - return _error->Error(_("Line %d too long (max %u)"), CurLine, sizeof(Buffer)); + return _error->Error(_("Line %d too long (max %lu)"), CurLine, sizeof(Buffer)); _strtabexpand(Buffer,sizeof(Buffer)); _strstrip(Buffer); diff --git a/debian/changelog b/debian/changelog index ef9784178..749609c8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ apt (0.7.10) UNRELEASED; urgency=low closes: #438136. * Fix cron.daily job to not call fail if apt isn't installed, closes: #443286. + * Fix compilation warnings in apt-pkg/cdrom.cc and + apt-pkg/contrib/configuration.cc. [ Program translations ] - Basque updated. Closes: #453088 @@ -59,7 +61,7 @@ apt (0.7.10) UNRELEASED; urgency=low * Fix wording for "After unpacking...". Thans to Michael Gilbert for the patch. Closes: #260825 - -- Christian Perrier Mon, 17 Dec 2007 10:10:17 +0530 + -- Otavio Salvador Thu, 27 Dec 2007 15:04:23 -0200 apt (0.7.9) unstable; urgency=low -- cgit v1.2.3