From ab0d4babe4e037474d8b1595008d3921e47b5c66 Mon Sep 17 00:00:00 2001
From: Uwe Seimet <Uwe.Seimet@seimet.de>
Date: Sat, 19 Oct 2024 12:10:21 +0200
Subject: [PATCH] Remove obsolete convenience method

---
 cpp/base/memory_util.cpp       | 9 ---------
 cpp/base/memory_util.h         | 1 -
 cpp/devices/storage_device.cpp | 4 ++--
 cpp/devices/tape.cpp           | 7 ++-----
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/cpp/base/memory_util.cpp b/cpp/base/memory_util.cpp
index 0833dacb..1e45c88b 100644
--- a/cpp/base/memory_util.cpp
+++ b/cpp/base/memory_util.cpp
@@ -32,15 +32,6 @@ void memory_util::SetInt32(vector<T> &buf, int offset, uint32_t value)
 template void memory_util::SetInt32(vector<byte>&, int, uint32_t);
 template void memory_util::SetInt32(vector<uint8_t>&, int, uint32_t);
 
-void memory_util::SetInt24(span<uint8_t> buf, int offset, int value)
-{
-    assert(buf.size() > static_cast<size_t>(offset) + 2);
-
-    buf[offset] = static_cast<uint8_t>(value >> 16);
-    buf[offset + 1] = static_cast<uint8_t>(value >> 8);
-    buf[offset + 2] = static_cast<uint8_t>(value);
-}
-
 int memory_util::GetInt24(span<const int> buf, int offset)
 {
     assert(buf.size() > static_cast<size_t>(offset) + 2);
diff --git a/cpp/base/memory_util.h b/cpp/base/memory_util.h
index 30781cfa..65a6faa7 100644
--- a/cpp/base/memory_util.h
+++ b/cpp/base/memory_util.h
@@ -27,7 +27,6 @@ int GetInt16(const auto &buf, int offset)
 template<typename T> void SetInt16(vector<T>&, int, int);
 template<typename T> void SetInt32(vector<T>&, int, uint32_t);
 
-void SetInt24(span<uint8_t>, int, int);
 int GetInt24(span<const int>, int);
 int32_t GetSignedInt24(span<const int>, int);
 uint32_t GetInt32(span<const int>, int);
diff --git a/cpp/devices/storage_device.cpp b/cpp/devices/storage_device.cpp
index 11c76ad0..1e4f16ae 100644
--- a/cpp/devices/storage_device.cpp
+++ b/cpp/devices/storage_device.cpp
@@ -399,7 +399,7 @@ int StorageDevice::ModeSense6(cdb_t cdb, vector<uint8_t> &buf) const
 
             // Short LBA mode parameter block descriptor (number of blocks and block length)
             SetInt32(buf, 4, static_cast<uint32_t>(blocks <= 0xffffffff ? blocks : 0xffffffff));
-            SetInt24(buf, 9, block_size);
+            SetInt32(buf, 8, block_size);
 
             size += 8;
         }
@@ -443,7 +443,7 @@ int StorageDevice::ModeSense10(cdb_t cdb, vector<uint8_t> &buf) const
 
                 // Short LBA mode parameter block descriptor (number of blocks and block length)
                 SetInt32(buf, 8, static_cast<uint32_t>(blocks <= 0xffffffff ? blocks : 0xffffffff));
-                SetInt24(buf, 13, block_size);
+                SetInt32(buf, 12, block_size);
 
                 size += 8;
             }
diff --git a/cpp/devices/tape.cpp b/cpp/devices/tape.cpp
index 4b4f2b2d..a1ae2faa 100644
--- a/cpp/devices/tape.cpp
+++ b/cpp/devices/tape.cpp
@@ -370,13 +370,10 @@ void Tape::Erase6()
 
 void Tape::ReadBlockLimits()
 {
-    vector<uint8_t> &buf = GetController()->GetBuffer();
-    buf[0] = 0;
-
     vector<uint32_t> sorted_sizes = { GetSupportedBlockSizes().cbegin(), GetSupportedBlockSizes().cend() };
     ranges::sort(sorted_sizes);
-    SetInt24(buf, 1, sorted_sizes.back());
-    SetInt16(buf, 4, 4);
+    SetInt32(GetController()->GetBuffer(), 0, sorted_sizes.back());
+    SetInt16(GetController()->GetBuffer(), 4, 4);
 
     DataInPhase(6);
 }