From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 11 Nov 2012 10:59:13 +0000 (+0900)
Subject: Fix build failure without zlib.
X-Git-Tag: v3.1.0~39^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f85ad6e87e29bee8f0b22c0a4f4283a04abc8da;p=thirdparty%2Flibarchive.git

Fix build failure without zlib.
---

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index c31f93435..362621f38 100644
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -541,7 +541,7 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry,
 	int64_t offset = zip->offset;
 	size_t remaining_bytes, metadata_bytes;
 	ssize_t hsize;
-	int r, ret = ARCHIVE_OK, eof;
+	int ret = ARCHIVE_OK, eof;
 
 	switch(rsrc->compression) {
 	case 0:  /* No compression. */
@@ -613,6 +613,9 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry,
 			break;
 #ifdef HAVE_ZLIB_H
 		case 8: /* Deflate compression. */
+		{
+			int r;
+
 			ret = zip_deflate_init(a, zip);
 			if (ret != ARCHIVE_OK)
 				goto exit_mac_metadata;
@@ -647,6 +650,7 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry,
 			metadata_bytes -= zip->stream.total_out;
 			mp += zip->stream.total_out;
 			break;
+		}
 #endif
 		default:
 			bytes_used = 0;