From 1e08e5a830b0e277df0c6e4b07f9ff2a3d2f7062 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sat, 25 Jan 2014 01:24:24 +0100 Subject: [PATCH] Fix a couple of minor warnings. Just so that the build passes w/ -Werror --- libarchive/archive_read_support_format_zip.c | 3 ++- libarchive/archive_write_set_format_zip.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c index 37fbeb14e..da1c85ab4 100644 --- a/libarchive/archive_read_support_format_zip.c +++ b/libarchive/archive_read_support_format_zip.c @@ -1697,7 +1697,8 @@ expose_parent_dirs(struct zip *zip, const char *name, size_t name_length) static int slurp_central_directory(struct archive_read *a, struct zip *zip) { - unsigned i, found; + ssize_t i; + unsigned found; int64_t correction; ssize_t bytes_avail; const char *p; diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c index 35b99f202..3fcd558f6 100644 --- a/libarchive/archive_write_set_format_zip.c +++ b/libarchive/archive_write_set_format_zip.c @@ -290,7 +290,7 @@ archive_write_zip_set_compression_deflate(struct archive *_a) { struct archive_write *a = (struct archive_write *)_a; int ret = ARCHIVE_FAILED; - + archive_check_magic(_a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA, "archive_write_zip_set_compression_deflate"); @@ -319,7 +319,7 @@ archive_write_zip_set_compression_store(struct archive *_a) struct archive_write *a = (struct archive_write *)_a; struct zip *zip = a->format_data; int ret = ARCHIVE_FAILED; - + archive_check_magic(_a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_NEW | ARCHIVE_STATE_HEADER | ARCHIVE_STATE_DATA, "archive_write_zip_set_compression_deflate"); @@ -406,7 +406,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry) unsigned char *cd_extra; size_t filename_length; const char *symlink = NULL; - size_t symlink_size; + size_t symlink_size = 0; struct archive_string_conv *sconv = get_sconv(a, zip); int ret, ret2 = ARCHIVE_OK; int64_t size; -- 2.47.2