From 50a35860ee9237d341948437c5f70a7f0987d393 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 30 Aug 2021 15:41:19 +0200
Subject: [PATCH] TarArchive: Small refactoring

---
 src/libutil/tarfile.cc | 26 ++++++++++++--------------
 src/libutil/tarfile.hh |  3 +++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/libutil/tarfile.cc b/src/libutil/tarfile.cc
index 38b4919dc..50e691a3d 100644
--- a/src/libutil/tarfile.cc
+++ b/src/libutil/tarfile.cc
@@ -39,32 +39,30 @@ void TarArchive::check(int err, const std::string & reason)
         throw Error(reason, archive_error_string(this->archive));
 }
 
-TarArchive::TarArchive(Source & source, bool raw) : buffer(4096)
+TarArchive::TarArchive(Source & source, bool raw)
+    : source(&source), buffer(4096)
 {
-    this->archive = archive_read_new();
-    this->source = &source;
-
-    if (!raw) {
-        archive_read_support_filter_all(archive);
+    init();
+    if (!raw)
         archive_read_support_format_all(archive);
-    } else {
-        archive_read_support_filter_all(archive);
+    else
         archive_read_support_format_raw(archive);
-        archive_read_support_format_empty(archive);
-    }
     check(archive_read_open(archive, (void *)this, callback_open, callback_read, callback_close), "Failed to open archive (%s)");
 }
 
-
 TarArchive::TarArchive(const Path & path)
 {
-    this->archive = archive_read_new();
-
-    archive_read_support_filter_all(archive);
+    init();
     archive_read_support_format_all(archive);
     check(archive_read_open_filename(archive, path.c_str(), 16384), "failed to open archive: %s");
 }
 
+void TarArchive::init()
+{
+    archive = archive_read_new();
+    archive_read_support_filter_all(archive);
+}
+
 void TarArchive::close()
 {
     check(archive_read_close(this->archive), "Failed to close archive (%s)");
diff --git a/src/libutil/tarfile.hh b/src/libutil/tarfile.hh
index 4d9141fd4..f107a7e2e 100644
--- a/src/libutil/tarfile.hh
+++ b/src/libutil/tarfile.hh
@@ -17,10 +17,13 @@ struct TarArchive {
     // disable copy constructor
     TarArchive(const TarArchive &) = delete;
 
+    void init();
+
     void close();
 
     ~TarArchive();
 };
+
 void unpackTarfile(Source & source, const Path & destDir);
 
 void unpackTarfile(const Path & tarFile, const Path & destDir);