summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-08-16 11:38:20 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-08-16 11:38:20 +0200
commitea6db08d45e012d577f3081fa2070db9e034add9 (patch)
treeb9042779b1aeecb6faef6e127f9b68175dd3127c
parentf107544e43fc3d262d9df5bde6eb430b7008825f (diff)
* apt-pkg/contrib/strutl.cc:
- fix error checking for vsnprintf in its safe variant Spotted by -Wextra: contrib/strutl.cc: In function 'char* safe_snprintf(char*, char*, const char*, ...)': contrib/strutl.cc:1172:14: warning: comparison of unsigned expression < 0 is always false
-rw-r--r--apt-pkg/contrib/strutl.cc2
-rw-r--r--debian/changelog4
2 files changed, 4 insertions, 2 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index ace74cb37..c1844de40 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1161,7 +1161,7 @@ void strprintf(string &out,const char *format,...)
char *safe_snprintf(char *Buffer,char *End,const char *Format,...)
{
va_list args;
- unsigned long Did;
+ int Did;
va_start(args,Format);
diff --git a/debian/changelog b/debian/changelog
index 671d9844e..23c1218d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,8 +37,10 @@ apt (0.8.0~pre1) UNRELASED; urgency=low
- purge packages in 'rc' state, thanks Rogier! (Closes: #150831)
* apt-pkg/pkgcache.cc:
- fix LongDesc handling in LANG=C environment
+ * apt-pkg/contrib/strutl.cc:
+ - fix error checking for vsnprintf in its safe variant
- -- David Kalnischkies <kalnischkies@gmail.com> Fri, 13 Aug 2010 16:40:57 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Mon, 16 Aug 2010 11:35:53 +0200
apt (0.7.26~exp12) experimental; urgency=low