Module Name: src
Committed By: yamt
Date: Thu May 22 15:44:21 UTC 2014
Modified Files:
src/external/bsd/bzip2/dist [yamt-pagecache]: bzip2.c
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/external/bsd/bzip2/dist/bzip2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bzip2/dist/bzip2.c
diff -u src/external/bsd/bzip2/dist/bzip2.c:1.3.2.2 src/external/bsd/bzip2/dist/bzip2.c:1.3.2.3
--- src/external/bsd/bzip2/dist/bzip2.c:1.3.2.2 Wed May 23 10:07:23 2012
+++ src/external/bsd/bzip2/dist/bzip2.c Thu May 22 15:44:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bzip2.c,v 1.3.2.2 2012/05/23 10:07:23 yamt Exp $ */
+/* $NetBSD: bzip2.c,v 1.3.2.3 2014/05/22 15:44:21 yamt Exp $ */
/*-----------------------------------------------------------*/
@@ -557,7 +557,7 @@ static
Bool testStream ( FILE *zStream )
{
BZFILE* bzf = NULL;
- Int32 bzerr, bzerr_dummy, ret, nread, streamNo, i;
+ Int32 bzerr, bzerr_dummy, ret, streamNo, i;
UChar obuf[5000];
UChar unused[BZ_MAX_UNUSED];
Int32 nUnused;
@@ -580,7 +580,7 @@ Bool testStream ( FILE *zStream )
streamNo++;
while (bzerr == BZ_OK) {
- nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
+ (void)BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler;
}
if (bzerr != BZ_STREAM_END) goto errhandler;
