summaryrefslogtreecommitdiff
path: root/libarchive/archive_read.c
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@acm.org>2015-06-28 11:38:49 -0700
committerTim Kientzle <kientzle@acm.org>2015-06-28 11:38:49 -0700
commit7e6793785d728f7d5960a530ef781ac6118d2339 (patch)
tree8d0370231827b756720db87dcc349e51061ff88c /libarchive/archive_read.c
parentb6af49f8d6129f2656449ae8583a0ec8c353fdb3 (diff)
downloadlibarchive-7e6793785d728f7d5960a530ef781ac6118d2339.tar.gz
Remove unnecessary conditional
Diffstat (limited to 'libarchive/archive_read.c')
-rw-r--r--libarchive/archive_read.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index 475309f1..11f7a0b7 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);