From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Tue, 16 Oct 2012 01:10:51 +0000 (+0900)
Subject: Fix build failure without zlib.
X-Git-Tag: v3.1.0~40^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=303a1834f3fc6c331942e2f9ba157def60db120e;p=thirdparty%2Flibarchive.git

Fix build failure without zlib.
---

diff --git a/libarchive/archive_write_add_filter_gzip.c b/libarchive/archive_write_add_filter_gzip.c
index c7d3714fd..7e119b98f 100644
--- a/libarchive/archive_write_add_filter_gzip.c
+++ b/libarchive/archive_write_add_filter_gzip.c
@@ -401,15 +401,11 @@ archive_compressor_gzip_open(struct archive_write_filter *f)
 		archive_strcat(&as, " -");
 		archive_strappend_char(&as, '0' + data->compression_level);
 	}
-	r = __archive_write_program_set_cmd(data->pdata, as.s);
-	archive_string_free(&as);
-	if (r != ARCHIVE_OK) {
-		archive_set_error(f->archive, ENOMEM, "Can't allocate memory");
-		return (ARCHIVE_FATAL);
-	}
-	f->write = archive_compressor_gzip_write;
 
-	return __archive_write_program_open(f, data->pdata);
+	f->write = archive_compressor_gzip_write;
+	r = __archive_write_program_open(f, data->pdata, as.s);
+	archive_string_free(&as);
+	return (r);
 }
 
 static int