* 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

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index ace74cb..c1844de 100644 (file)
--- 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 671d984..23c1218 100644 (file)
--- 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