jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 11:12:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More corrections from Joerg Sonnenberger.

Browse Source
This commit is contained in:
Tim Kientzle 2007-04-05 05:22:13 +00:00
parent fe95f8fde6
commit 8c338614ac
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=168381
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libarchive/archive_read.c
View File

@ -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);