From 2e511246fa99ad6a9f9cf1bbb8cf35a51382cd19 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 25 Jul 2020 03:17:01 -0400
Subject: lz4_compression: Make use of std::span in interfaces

Allows compressing the data and size parameters into one.
---
 src/common/lz4_compression.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/common/lz4_compression.cpp')

diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp
index ade6759bb..8e2e4094b 100644
--- a/src/common/lz4_compression.cpp
+++ b/src/common/lz4_compression.cpp
@@ -10,14 +10,14 @@
 
 namespace Common::Compression {
 
-std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) {
-    ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size");
+std::vector<u8> CompressDataLZ4(std::span<const u8> source) {
+    ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size");
 
-    const auto source_size_int = static_cast<int>(source_size);
+    const auto source_size_int = static_cast<int>(source.size());
     const int max_compressed_size = LZ4_compressBound(source_size_int);
     std::vector<u8> compressed(max_compressed_size);
 
-    const int compressed_size = LZ4_compress_default(reinterpret_cast<const char*>(source),
+    const int compressed_size = LZ4_compress_default(reinterpret_cast<const char*>(source.data()),
                                                      reinterpret_cast<char*>(compressed.data()),
                                                      source_size_int, max_compressed_size);
 
@@ -31,18 +31,17 @@ std::vector<u8> CompressDataLZ4(const u8* source, std::size_t source_size) {
     return compressed;
 }
 
-std::vector<u8> CompressDataLZ4HC(const u8* source, std::size_t source_size,
-                                  s32 compression_level) {
-    ASSERT_MSG(source_size <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size");
+std::vector<u8> CompressDataLZ4HC(std::span<const u8> source, s32 compression_level) {
+    ASSERT_MSG(source.size() <= LZ4_MAX_INPUT_SIZE, "Source size exceeds LZ4 maximum input size");
 
     compression_level = std::clamp(compression_level, LZ4HC_CLEVEL_MIN, LZ4HC_CLEVEL_MAX);
 
-    const auto source_size_int = static_cast<int>(source_size);
+    const auto source_size_int = static_cast<int>(source.size());
     const int max_compressed_size = LZ4_compressBound(source_size_int);
     std::vector<u8> compressed(max_compressed_size);
 
     const int compressed_size = LZ4_compress_HC(
-        reinterpret_cast<const char*>(source), reinterpret_cast<char*>(compressed.data()),
+        reinterpret_cast<const char*>(source.data()), reinterpret_cast<char*>(compressed.data()),
         source_size_int, max_compressed_size, compression_level);
 
     if (compressed_size <= 0) {
@@ -55,8 +54,8 @@ std::vector<u8> CompressDataLZ4HC(const u8* source, std::size_t source_size,
     return compressed;
 }
 
-std::vector<u8> CompressDataLZ4HCMax(const u8* source, std::size_t source_size) {
-    return CompressDataLZ4HC(source, source_size, LZ4HC_CLEVEL_MAX);
+std::vector<u8> CompressDataLZ4HCMax(std::span<const u8> source) {
+    return CompressDataLZ4HC(source, LZ4HC_CLEVEL_MAX);
 }
 
 std::vector<u8> DecompressDataLZ4(const std::vector<u8>& compressed,
-- 
cgit v1.2.3