diff options
| author | Tim Kientzle <kientzle@gmail.com> | 2013-12-19 20:55:10 -0800 |
|---|---|---|
| committer | Tim Kientzle <kientzle@gmail.com> | 2013-12-19 20:55:10 -0800 |
| commit | 7a90710e0d3c786cf4f3af2457a815db6c9b5a5a (patch) | |
| tree | 3aa72778798b038a32a712eecc5d9fd0b43aaa75 /libarchive/archive_read_support_format_tar.c | |
| parent | 9c9928712d75594aab8d6e4e07de6cff7058fe3e (diff) | |
| parent | 2de568ca5b0ccdbababf6e3857e2e05eea9eb0a6 (diff) | |
| download | libarchive-7a90710e0d3c786cf4f3af2457a815db6c9b5a5a.tar.gz | |
Merge branch 'encryption_detection' of github.com:kwk/libarchive into kwk-encryption_detection
Conflicts:
libarchive/archive_read_support_format_zip.c
Diffstat (limited to 'libarchive/archive_read_support_format_tar.c')
| -rw-r--r-- | libarchive/archive_read_support_format_tar.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c index 53b638b8..f491639f 100644 --- a/libarchive/archive_read_support_format_tar.c +++ b/libarchive/archive_read_support_format_tar.c @@ -259,7 +259,9 @@ archive_read_support_format_tar(struct archive *_a) archive_read_format_tar_read_data, archive_read_format_tar_skip, NULL, - archive_read_format_tar_cleanup); + archive_read_format_tar_cleanup, + NULL, + NULL); if (r != ARCHIVE_OK) free(tar); |