diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-16 12:12:51 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-16 12:12:51 +0200 |
| commit | 6802b90c0871726f0018b2c3c059bf8c95a4a710 (patch) | |
| tree | 1fa6162a9a884565b970567bada109a67de42a80 | |
| parent | ea6db08d45e012d577f3081fa2070db9e034add9 (diff) | |
* 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
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | methods/bzip2.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 23c1218d9..f72cad087 100644 --- a/debian/changelog +++ b/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 diff --git a/methods/bzip2.cc b/methods/bzip2.cc index 19e49828e..241f21c66 100644 --- a/methods/bzip2.cc +++ b/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; |