diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-02-09 10:56:05 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-02-09 10:56:05 +0000 |
| commit | bfd7accf016895bfc7c0af369106f52e0ca32e79 (patch) | |
| tree | ea9e0ff2a038ff253d22999a64e6a39cdbe6ac86 /libarchive/archive_read_support_format_zip.c | |
| parent | 17993d47e9beebea021707962fcdf2387b27cae9 (diff) | |
Notes
Diffstat (limited to 'libarchive/archive_read_support_format_zip.c')
| -rw-r--r-- | libarchive/archive_read_support_format_zip.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c index f805855fa7ad..fce04b8a2cc1 100644 --- a/libarchive/archive_read_support_format_zip.c +++ b/libarchive/archive_read_support_format_zip.c @@ -140,6 +140,9 @@ static time_t zip_time(const char *); static const char *compression_name(int compression); static void process_extra(const char *, size_t, struct zip_entry *); +int archive_read_support_format_zip_streamable(struct archive *); +int archive_read_support_format_zip_seekable(struct archive *); + int archive_read_support_format_zip_streamable(struct archive *_a) { @@ -716,8 +719,8 @@ compression_name(int compression) "deflation" }; - if (compression < - sizeof(compression_names)/sizeof(compression_names[0])) + if (0 <= compression && compression < + (int)(sizeof(compression_names)/sizeof(compression_names[0]))) return compression_names[compression]; else return "??"; @@ -860,6 +863,8 @@ zip_read_data_none(struct archive_read *a, const void **_buff, const char *buff; ssize_t bytes_avail; + (void)offset; /* UNUSED */ + zip = (struct zip *)(a->format->data); if (zip->entry->flags & ZIP_LENGTH_AT_END) { @@ -940,6 +945,8 @@ zip_read_data_deflate(struct archive_read *a, const void **buff, const void *compressed_buff; int r; + (void)offset; /* UNUSED */ + zip = (struct zip *)(a->format->data); /* If the buffer hasn't been allocated, allocate it now. */ |