summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/archive_read.c
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2007-04-05 05:22:13 +0000
committerkientzle <kientzle@FreeBSD.org>2007-04-05 05:22:13 +0000
commitf267b347f9e50af1a2cd970d17b45cffb7749d7a (patch)
tree362729899464331aac4c5b281c4620813d68b1b4 /lib/libarchive/archive_read.c
parentbf75e04a4eecdd158380fa0d26d71e71c6a54dc0 (diff)
downloadFreeBSD-src-f267b347f9e50af1a2cd970d17b45cffb7749d7a.zip
FreeBSD-src-f267b347f9e50af1a2cd970d17b45cffb7749d7a.tar.gz
More corrections from Joerg Sonnenberger.
Diffstat (limited to 'lib/libarchive/archive_read.c')
-rw-r--r--lib/libarchive/archive_read.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libarchive/archive_read.c b/lib/libarchive/archive_read.c
index 19d72e4..2c0c661 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);
OpenPOWER on IntegriCloud