From baa9b408d655c11f46f534a85a8e9420b3f88f53 Mon Sep 17 00:00:00 2001 From: Jamie Winsor Date: Mon, 21 Mar 2016 13:23:47 -0700 Subject: [PATCH] don't close on free - libarchive takes care of this --- libraries/libarchive/src/reader.rs | 2 -- libraries/libarchive/src/writer.rs | 2 -- 2 files changed, 4 deletions(-) diff --git a/libraries/libarchive/src/reader.rs b/libraries/libarchive/src/reader.rs index b0aaf207..c913b1c8 100644 --- a/libraries/libarchive/src/reader.rs +++ b/libraries/libarchive/src/reader.rs @@ -139,7 +139,6 @@ impl Reader for FileReader { impl Drop for FileReader { fn drop(&mut self) { unsafe { - ffi::archive_read_close(self.handle()); // jw todo: close here? ffi::archive_read_free(self.handle()); } } @@ -188,7 +187,6 @@ impl Reader for StreamReader { impl Drop for StreamReader { fn drop(&mut self) { unsafe { - ffi::archive_read_close(self.handle()); // jw todo: close here? ffi::archive_read_free(self.handle()); } } diff --git a/libraries/libarchive/src/writer.rs b/libraries/libarchive/src/writer.rs index 06a5b85b..ca90e524 100644 --- a/libraries/libarchive/src/writer.rs +++ b/libraries/libarchive/src/writer.rs @@ -202,8 +202,6 @@ impl Default for Disk { impl Drop for Disk { fn drop(&mut self) { - // JW TODO: do not close, libarchive will handle it - self.close().unwrap(); unsafe { ffi::archive_write_free(self.handle()); }