From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 10 Nov 2008 18:53:33 +0000 (-0500)
Subject: Fix gzip/bzip2 support compiling on platforms that lack zlib/bzlib.
X-Git-Tag: v2.6.0~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edce1bc95b19915aab601dc972162703bf466e6c;p=thirdparty%2Flibarchive.git

Fix gzip/bzip2 support compiling on platforms that lack zlib/bzlib.
Submitted by:	Ivailo Petrov

SVN-Revision: 248
---

diff --git a/libarchive/archive_read_support_compression_bzip2.c b/libarchive/archive_read_support_compression_bzip2.c
index e60ec68de..e6319f1f2 100644
--- a/libarchive/archive_read_support_compression_bzip2.c
+++ b/libarchive/archive_read_support_compression_bzip2.c
@@ -171,7 +171,7 @@ bzip2_reader_bid(struct archive_reader *self, const void *buff, size_t len)
  * decompression.  We can, however, still detect compressed archives
  * and emit a useful message.
  */
-static int
+static struct archive_read_source *
 bzip2_reader_init(struct archive_read *a, struct archive_reader *reader,
     struct archive_read_source *upstream, const void *buff, size_t n)
 {
@@ -183,7 +183,7 @@ bzip2_reader_init(struct archive_read *a, struct archive_reader *reader,
 
 	archive_set_error(&a->archive, -1,
 	    "This version of libarchive was compiled without bzip2 support");
-	return (ARCHIVE_FATAL);
+	return (NULL);
 }
 
 
diff --git a/libarchive/archive_read_support_compression_gzip.c b/libarchive/archive_read_support_compression_gzip.c
index 2066d0975..1df82d7df 100644
--- a/libarchive/archive_read_support_compression_gzip.c
+++ b/libarchive/archive_read_support_compression_gzip.c
@@ -163,9 +163,9 @@ gzip_reader_bid(struct archive_reader *self, const void *buff, size_t len)
  * decompression.  We can, however, still detect compressed archives
  * and emit a useful message.
  */
-static int
-gzip_reader_init(struct archive_read *a, struct archive_read_source *upstream,
-    const void *buff, size_t n)
+static struct archive_read_source *
+gzip_reader_init(struct archive_read *a, struct archive_reader *reader,
+    struct archive_read_source *upstream, const void *buff, size_t n)
 {
 	(void)a;	/* UNUSED */
 	(void)buff;	/* UNUSED */
@@ -173,7 +173,7 @@ gzip_reader_init(struct archive_read *a, struct archive_read_source *upstream,
 
 	archive_set_error(&a->archive, -1,
 	    "This version of libarchive was compiled without gzip support");
-	return (ARCHIVE_FATAL);
+	return (NULL);
 }
 
 #else