Просмотр исходного кода

* methods/bzip2.cc:
- fix error checking for read in case of failing bzip2/lzma/whatever

Spotted by -Wextra:
bzip2.cc: In member function ‘virtual bool Bzip2Method::Fetch(pkgAcqMethod::FetchItem*)’:
bzip2.cc:108:19: warning: comparison of unsigned expression < 0 is always false
bzip2.cc:111:19: warning: comparison of unsigned expression < 0 is always false

David Kalnischkies лет назад: 16
Родитель
Сommit
6802b90c08
2 измененных файлов с 4 добавлено и 3 удалено
  1. 3 1
      debian/changelog
  2. 1 2
      methods/bzip2.cc

+ 3 - 1
debian/changelog

@@ -39,8 +39,10 @@ apt (0.8.0~pre1) UNRELASED; urgency=low
     - fix LongDesc handling in LANG=C environment
   * apt-pkg/contrib/strutl.cc:
     - fix error checking for vsnprintf in its safe variant
+  * methods/bzip2.cc:
+    - fix error checking for read in case of failing bzip2/lzma/whatever
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 16 Aug 2010 11:35:53 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 16 Aug 2010 12:07:54 +0200
 
 apt (0.7.26~exp12) experimental; urgency=low
 

+ 1 - 2
methods/bzip2.cc

@@ -102,9 +102,8 @@ bool Bzip2Method::Fetch(FetchItem *Itm)
    while (1) 
    {
       unsigned char Buffer[4*1024];
-      unsigned long Count;
       
-      Count = read(GzOut[0],Buffer,sizeof(Buffer));
+      ssize_t Count = read(GzOut[0],Buffer,sizeof(Buffer));
       if (Count < 0 && errno == EINTR)
 	 continue;