upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Argh. r189389 was supposed to include r539 from libarchive.googlecode.com

Browse source 
but those compile fixes somehow got lost.  This should fix the build.
This commit is contained in:
Tim Kientzle 2009-03-05 06:26:08 +00:00
parent 241028d43a
commit ffd201719e
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libarchive/archive_read_support_compression_bzip2.c
View file

@ -105,7 +105,7 @@ static int
bzip2_reader_bid(struct archive_read_filter_bidder *self, struct archive_read_filter *filter)
{
const unsigned char *buffer;
size_t avail;
ssize_t avail;
int bits_checked;
(void)self; /* UNUSED */
@ -200,7 +200,7 @@ bzip2_filter_read(struct archive_read_filter *self, const void **p)
struct private_data *state;
size_t read_avail, decompressed;
unsigned char *read_buf;
int ret;
ssize_t ret;
state = (struct private_data *)self->data;
read_avail = 0;

5
lib/libarchive/archive_read_support_compression_compress.c
View file

@ -168,7 +168,7 @@ compress_bidder_bid(struct archive_read_filter_bidder *self,
struct archive_read_filter *filter)
{
const unsigned char *buffer;
size_t avail;
ssize_t avail;
int bits_checked;
(void)self; /* UNUSED */
@ -410,7 +410,8 @@ static int
getbits(struct archive_read_filter *self, int n)
{
struct private_data *state = (struct private_data *)self->data;
int code, ret;
int code;
ssize_t ret;
static const int mask[] = {
0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff,
0x1ff, 0x3ff, 0x7ff, 0xfff, 0x1fff, 0x3fff, 0x7fff, 0xffff

6
lib/libarchive/archive_read_support_format_cpio.c
View file

@ -329,7 +329,8 @@ find_newc_header(struct archive_read *a)
{
const void *h;
const char *p, *q;
size_t skip, bytes, skipped = 0;
size_t skip, skipped = 0;
ssize_t bytes;
for (;;) {
h = __archive_read_ahead(a, sizeof(struct cpio_newc_header), &bytes);
@ -463,7 +464,8 @@ find_odc_header(struct archive_read *a)
{
const void *h;
const char *p, *q;
size_t skip, bytes, skipped = 0;
size_t skip, skipped = 0;
ssize_t bytes;
for (;;) {
h = __archive_read_ahead(a, sizeof(struct cpio_odc_header), &bytes);