Merging upstream version 0.12.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 11 insertions, 8 deletions

diff --git a/src/pcap_manager.hh b/src/file_converter_manager.hh
index 319dfdc..281f195 100644
--- a/src/pcap_manager.hh
+++ b/src/file_converter_manager.hh
@@ -25,12 +25,10 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @file pcap_manager.hh
  */
 
-#ifndef lnav_pcap_manager_hh
-#define lnav_pcap_manager_hh
+#ifndef lnav_file_converter_manager_hh
+#define lnav_file_converter_manager_hh
 
 #include <string>
 #include <vector>
@@ -38,17 +36,22 @@
 #include "base/auto_fd.hh"
 #include "base/auto_pid.hh"
 #include "base/result.h"
+#include "file_format.hh"
+#include "ghc/filesystem.hpp"
 
-namespace pcap_manager {
+namespace file_converter_manager {
 
 struct convert_result {
     auto_pid<process_state::running> cr_child;
-    auto_fd cr_destination;
+    ghc::filesystem::path cr_destination;
     std::shared_ptr<std::vector<std::string>> cr_error_queue;
 };
 
-Result<convert_result, std::string> convert(const std::string& filename);
+Result<convert_result, std::string> convert(const external_file_format& eff,
+                                            const std::string& filename);
+
+void cleanup();
 
-}  // namespace pcap_manager
+}  // namespace file_converter_manager
 
 #endif