From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 6 Jan 2009 09:33:13 +0000 (-0500)
Subject: One more fix to compiling error when zlib/bzlib is unavailable
X-Git-Tag: v2.7.0~471
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5a2a44e7aa455aa03d68749a0bc643418c9ee25;p=thirdparty%2Flibarchive.git

One more fix to compiling error when zlib/bzlib is unavailable

SVN-Revision: 379
---

diff --git a/libarchive/archive_read_support_compression_bzip2.c b/libarchive/archive_read_support_compression_bzip2.c
index 97eaad414..57d079d51 100644
--- a/libarchive/archive_read_support_compression_bzip2.c
+++ b/libarchive/archive_read_support_compression_bzip2.c
@@ -149,11 +149,10 @@ bzip2_reader_bid(struct archive_read_filter_bidder *self, struct archive_read_fi
 static int
 bzip2_reader_init(struct archive_read_filter *self)
 {
-	(void)self;	/* UNUSED */
 
-	archive_set_error(&a->archive, -1,
+	archive_set_error(&self->archive->archive, -1,
 	    "This version of libarchive was compiled without bzip2 support");
-	return (NULL);
+	return (ARCHIVE_FATAL);
 }
 
 
diff --git a/libarchive/archive_read_support_compression_gzip.c b/libarchive/archive_read_support_compression_gzip.c
index 4488d9c79..eaf4149ec 100644
--- a/libarchive/archive_read_support_compression_gzip.c
+++ b/libarchive/archive_read_support_compression_gzip.c
@@ -158,11 +158,10 @@ gzip_bidder_bid(struct archive_read_filter_bidder *self,
 static int
 gzip_bidder_init(struct archive_read_filter *filter)
 {
-	(void)filter;	/* UNUSED */
 
-	archive_set_error(&a->archive, -1,
+	archive_set_error(&filter->archive->archive, -1,
 	    "This version of libarchive was compiled without gzip support");
-	return (NULL);
+	return (ARCHIVE_FATAL);
 }
 
 #else