summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-12-27 15:04:42 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2007-12-27 15:04:42 -0200
commita376d6fdfe2f01cddd980fb14f53a3d4580d4779 (patch)
treeefe91795c7017b646861a2d14dea064433edeb51
parent383594799377d5e628ee84557218f538d7b0bc0a (diff)
* Fix compilation warnings in apt-pkg/cdrom.cc and
apt-pkg/contrib/configuration.cc.
-rw-r--r--apt-pkg/cdrom.cc4
-rw-r--r--apt-pkg/contrib/configuration.cc2
-rw-r--r--debian/changelog4
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 <bubulle@debian.org> Mon, 17 Dec 2007 10:10:17 +0530
+ -- Otavio Salvador <otavio@debian.org> Thu, 27 Dec 2007 15:04:23 -0200
apt (0.7.9) unstable; urgency=low