From 69d24d1027b24b6c986878d0f78244b9ec64c330 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 2 Sep 2019 08:09:07 -0400
Subject: [PATCH] General: Use std::array for constructors where applicable

Same behavior, but ensures input absolutely satisfies the total amount
of data that needs to be copied.
---
 include/kabufuda/Directory.hpp | 7 +++++--
 include/kabufuda/File.hpp      | 8 +++++---
 lib/kabufuda/Directory.cpp     | 2 +-
 lib/kabufuda/File.cpp          | 2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/include/kabufuda/Directory.hpp b/include/kabufuda/Directory.hpp
index de5fdf4..18cd252 100644
--- a/include/kabufuda/Directory.hpp
+++ b/include/kabufuda/Directory.hpp
@@ -15,9 +15,12 @@ class Directory {
     uint16_t m_checksum;
     uint16_t m_checksumInv;
   };
+
+  using RawData = std::array<uint8_t, BlockSize>;
+
   union {
     Data data;
-    std::array<uint8_t, BlockSize> raw;
+    RawData raw;
   };
 #pragma pack(pop)
 
@@ -27,7 +30,7 @@ class Directory {
 
 public:
   Directory();
-  Directory(uint8_t data[BlockSize]);
+  explicit Directory(const RawData& rawData);
   ~Directory() = default;
 
   bool hasFreeFile() const;
diff --git a/include/kabufuda/File.hpp b/include/kabufuda/File.hpp
index b7071a6..eb7d4d1 100644
--- a/include/kabufuda/File.hpp
+++ b/include/kabufuda/File.hpp
@@ -10,6 +10,8 @@ class File {
   friend class Directory;
   friend class Card;
 #pragma pack(push, 4)
+  using RawData = std::array<uint8_t, 0x40>;
+
   union {
     struct {
       std::array<uint8_t, 4> m_game;
@@ -28,7 +30,7 @@ class File {
       uint16_t m_reserved2;
       uint32_t m_commentAddr;
     };
-    std::array<uint8_t, 0x40> raw;
+    RawData raw;
   };
 
 #pragma pack(pop)
@@ -36,8 +38,8 @@ class File {
 
 public:
   File();
-  File(char data[0x40]);
-  File(const char* filename);
+  explicit File(const RawData& rawData);
+  explicit File(const char* filename);
   ~File() = default;
 };
 } // namespace kabufuda
diff --git a/lib/kabufuda/Directory.cpp b/lib/kabufuda/Directory.cpp
index fb4e464..79ba813 100644
--- a/lib/kabufuda/Directory.cpp
+++ b/lib/kabufuda/Directory.cpp
@@ -35,7 +35,7 @@ Directory::Directory() {
   updateChecksum();
 }
 
-Directory::Directory(uint8_t data[]) { std::memcpy(raw.data(), data, BlockSize); }
+Directory::Directory(const RawData& rawData) : raw{rawData} {}
 
 bool Directory::hasFreeFile() const {
   return std::any_of(data.m_files.cbegin(), data.m_files.cend(),
diff --git a/lib/kabufuda/File.cpp b/lib/kabufuda/File.cpp
index 2afd3ba..55349ae 100644
--- a/lib/kabufuda/File.cpp
+++ b/lib/kabufuda/File.cpp
@@ -8,7 +8,7 @@
 namespace kabufuda {
 File::File() { raw.fill(0xFF); }
 
-File::File(char data[]) { std::memcpy(raw.data(), data, raw.size()); }
+File::File(const RawData& rawData) : raw{rawData} {}
 
 File::File(const char* filename) {
   raw.fill(0);