From 8c338614acf4ae030cba5ae12003a73bd97db85f Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Thu, 5 Apr 2007 05:22:13 +0000 Subject: [PATCH] More corrections from Joerg Sonnenberger. --- lib/libarchive/archive_read.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c index 19d72e47cfae..2c0c66192689 100644 --- a/lib/libarchive/archive_read.c +++ b/lib/libarchive/archive_read.c @@ -274,8 +274,8 @@ dummy_skip(struct archive_read * a, off_t request) return (ARCHIVE_FATAL); } if (bytes_read > request) - bytes_read = request; - (a->compression_read_consume)(a, bytes_read); + bytes_read = (ssize_t)request; + (a->compression_read_consume)(a, (size_t)bytes_read); request -= bytes_read; bytes_skipped += bytes_read; } @@ -448,7 +448,7 @@ archive_read_data(struct archive *_a, void *buff, size_t s) dest = (char *)buff; while (s > 0) { - if (a->read_data_remaining <= 0) { + if (a->read_data_remaining == 0) { read_buf = a->read_data_block; r = archive_read_data_block(&a->archive, &read_buf, &a->read_data_remaining, &a->read_data_offset);