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

Merge r591 from libarchive.googlecode.com: signed/unsigned fixes.

Browse Source
This commit is contained in:
Tim Kientzle 2009-03-07 02:29:43 +00:00
parent cdad0e17a1
commit 4f7d8a29e1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=189475
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libarchive/archive_read_support_compression_bzip2.c
View File

@ -200,7 +200,7 @@ bzip2_filter_read(struct archive_read_filter *self, const void **p)
{ {
struct private_data *state; struct private_data *state;
size_t read_avail, decompressed; size_t read_avail, decompressed;
unsigned char *read_buf; const char *read_buf;
ssize_t ret; ssize_t ret;
state = (struct private_data *)self->data; state = (struct private_data *)self->data;
@ -262,11 +262,11 @@ bzip2_filter_read(struct archive_read_filter *self, const void **p)
/* stream.next_in is really const, but bzlib /* stream.next_in is really const, but bzlib
* doesn't declare it so. <sigh> */ * doesn't declare it so. <sigh> */
read_buf = (unsigned char *)(uintptr_t) read_buf =
__archive_read_filter_ahead(self->upstream, 1, &ret); __archive_read_filter_ahead(self->upstream, 1, &ret);
if (read_buf == NULL) if (read_buf == NULL)
return (ARCHIVE_FATAL); return (ARCHIVE_FATAL);
state->stream.next_in = read_buf; state->stream.next_in = (char *)(uintptr_t)read_buf;
state->stream.avail_in = ret; state->stream.avail_in = ret;
/* There is no more data, return whatever we have. */ /* There is no more data, return whatever we have. */
if (ret == 0) { if (ret == 0) {
@ -280,7 +280,7 @@ bzip2_filter_read(struct archive_read_filter *self, const void **p)
/* Decompress as much as we can in one pass. */ /* Decompress as much as we can in one pass. */
ret = BZ2_bzDecompress(&(state->stream)); ret = BZ2_bzDecompress(&(state->stream));
__archive_read_filter_consume(self->upstream, __archive_read_filter_consume(self->upstream,
(unsigned char *)state->stream.next_in - read_buf); state->stream.next_in - read_buf);
switch (ret) { switch (ret) {
case BZ_STREAM_END: /* Found end of stream. */ case BZ_STREAM_END: /* Found end of stream. */