From: Tim Kientzle <kientzle@acm.org>
Date: Sun, 28 Jun 2015 18:38:49 +0000 (-0700)
Subject: Remove unnecessary conditional
X-Git-Tag: v3.1.900a~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e6793785d728f7d5960a530ef781ac6118d2339;p=thirdparty%2Flibarchive.git

Remove unnecessary conditional
---

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index 475309f1c..11f7a0b73 100644
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -676,7 +676,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry)
 	return (r2 < r1 || r2 == ARCHIVE_EOF) ? r2 : r1;
 }
 
-int
+static int
 _archive_read_next_header(struct archive *_a, struct archive_entry **entryp)
 {
 	int ret;
@@ -1100,8 +1100,7 @@ _archive_read_free(struct archive *_a)
 	}
 
 	archive_string_free(&a->archive.error_string);
-	if (a->entry)
-		archive_entry_free(a->entry);
+	archive_entry_free(a->entry);
 	a->archive.magic = 0;
 	__archive_clean(&a->archive);
 	free(a->client.dataset);