Remove makeDecompressionSource()

This function doesn't support all compression methods (i.e. 'none' and
'br') so it shouldn't be exposed.

Also restore the original decompress() as a wrapper around
makeDecompressionSink().

2 files changed, 6 insertions, 21 deletions

diff --git a/src/libutil/compression.cc b/src/libutil/compression.cc
index c5dae42fa..7e725cae1 100644
--- a/src/libutil/compression.cc
+++ b/src/libutil/compression.cc
@@ -186,19 +186,11 @@ struct BrotliDecompressionSink : ChunkedCompressionSink
 
 ref<std::string> decompress(const std::string & method, const std::string & in)
 {
-    if (method == "none" || method == "")
-        return make_ref<std::string>(in);
-    else if (method == "br") {
-        StringSink ssink;
-        auto sink = makeDecompressionSink(method, ssink);
-        (*sink)(in);
-        sink->finish();
-        return ssink.s;
-    } else {
-        StringSource ssrc(in);
-        auto src = makeDecompressionSource(ssrc);
-        return make_ref<std::string>(src->drain());
-    }
+    StringSink ssink;
+    auto sink = makeDecompressionSink(method, ssink);
+    (*sink)(in);
+    sink->finish();
+    return ssink.s;
 }
 
 std::unique_ptr<FinishSink> makeDecompressionSink(const std::string & method, Sink & nextSink)
@@ -209,7 +201,7 @@ std::unique_ptr<FinishSink> makeDecompressionSink(const std::string & method, Si
         return std::make_unique<BrotliDecompressionSink>(nextSink);
     else
         return sourceToSink([&](Source & source) {
-            auto decompressionSource = makeDecompressionSource(source);
+            auto decompressionSource = std::make_unique<ArchiveDecompressionSource>(source);
             decompressionSource->drainInto(nextSink);
         });
 }
@@ -267,11 +259,6 @@ struct BrotliCompressionSink : ChunkedCompressionSink
     }
 };
 
-std::unique_ptr<Source> makeDecompressionSource(Source & prev)
-{
-    return std::unique_ptr<Source>(new ArchiveDecompressionSource(prev));
-}
-
 ref<CompressionSink> makeCompressionSink(const std::string & method, Sink & nextSink, const bool parallel)
 {
     std::vector<std::string> la_supports = {
diff --git a/src/libutil/compression.hh b/src/libutil/compression.hh
index a140f8be2..338a0d9f2 100644
--- a/src/libutil/compression.hh
+++ b/src/libutil/compression.hh
@@ -15,8 +15,6 @@ struct CompressionSink : BufferedSink, FinishSink
     using FinishSink::finish;
 };
 
-std::unique_ptr<Source> makeDecompressionSource(Source & prev);
-
 ref<std::string> decompress(const std::string & method, const std::string & in);
 
 std::unique_ptr<FinishSink> makeDecompressionSink(const std::string & method, Sink & nextSink);