diff options
author | joerg <joerg@pkgsrc.org> | 2019-09-22 09:51:28 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2019-09-22 09:51:28 +0000 |
commit | 85efd7f8759590df15b06d680dc2c141a499d7d3 (patch) | |
tree | 89973fc4fc77a5c0ac5daa4ea8e0e1afbf23fbf5 /archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c | |
parent | 3d58b3c8e51f686500fbe08fc5fea947dfa036b4 (diff) | |
download | pkgsrc-85efd7f8759590df15b06d680dc2c141a499d7d3.tar.gz |
Import libarchive 3.4.0KIENTZLE
Diffstat (limited to 'archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c')
-rw-r--r-- | archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c b/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c index c54aeabdb19..ad4ccb77ea5 100644 --- a/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c +++ b/archivers/libarchive/files/libarchive/archive_write_set_format_ustar.c @@ -352,14 +352,12 @@ archive_write_ustar_header(struct archive_write *a, struct archive_entry *entry) #endif ret = __archive_write_format_header_ustar(a, buff, entry, -1, 1, sconv); if (ret < ARCHIVE_WARN) { - if (entry_main) - archive_entry_free(entry_main); + archive_entry_free(entry_main); return (ret); } ret2 = __archive_write_output(a, buff, 512); if (ret2 < ARCHIVE_WARN) { - if (entry_main) - archive_entry_free(entry_main); + archive_entry_free(entry_main); return (ret2); } if (ret2 < ret) @@ -367,8 +365,7 @@ archive_write_ustar_header(struct archive_write *a, struct archive_entry *entry) ustar->entry_bytes_remaining = archive_entry_size(entry); ustar->entry_padding = 0x1ff & (-(int64_t)ustar->entry_bytes_remaining); - if (entry_main) - archive_entry_free(entry_main); + archive_entry_free(entry_main); return (ret); } |