mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-28 13:22:48 +00:00
More corrections from Joerg Sonnenberger.
This commit is contained in:
parent
fe95f8fde6
commit
8c338614ac
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=168381
@ -274,8 +274,8 @@ dummy_skip(struct archive_read * a, off_t request)
|
|||||||
return (ARCHIVE_FATAL);
|
return (ARCHIVE_FATAL);
|
||||||
}
|
}
|
||||||
if (bytes_read > request)
|
if (bytes_read > request)
|
||||||
bytes_read = request;
|
bytes_read = (ssize_t)request;
|
||||||
(a->compression_read_consume)(a, bytes_read);
|
(a->compression_read_consume)(a, (size_t)bytes_read);
|
||||||
request -= bytes_read;
|
request -= bytes_read;
|
||||||
bytes_skipped += bytes_read;
|
bytes_skipped += bytes_read;
|
||||||
}
|
}
|
||||||
@ -448,7 +448,7 @@ archive_read_data(struct archive *_a, void *buff, size_t s)
|
|||||||
dest = (char *)buff;
|
dest = (char *)buff;
|
||||||
|
|
||||||
while (s > 0) {
|
while (s > 0) {
|
||||||
if (a->read_data_remaining <= 0) {
|
if (a->read_data_remaining == 0) {
|
||||||
read_buf = a->read_data_block;
|
read_buf = a->read_data_block;
|
||||||
r = archive_read_data_block(&a->archive, &read_buf,
|
r = archive_read_data_block(&a->archive, &read_buf,
|
||||||
&a->read_data_remaining, &a->read_data_offset);
|
&a->read_data_remaining, &a->read_data_offset);
|
||||||
|
Loading…
Reference in New Issue
Block a user