From 7b32458aec8324e050bfac19e44f1829b234cbc2 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Wed, 21 Jul 2021 15:38:41 +0200
Subject: [PATCH] Improve a bit two esmreader logging call

---
 components/esm/esmreader.cpp | 5 ++---
 components/esm/esmreader.hpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp
index 0cf7c3f81f..dbf713315b 100644
--- a/components/esm/esmreader.cpp
+++ b/components/esm/esmreader.cpp
@@ -125,8 +125,7 @@ void ESMReader::getHExact(void*p, int size)
 {
     getSubHeader();
     if (size != static_cast<int> (mCtx.leftSub))
-        fail("Size mismatch, requested " + std::to_string(size) + " but got "
-                + std::to_string(mCtx.leftSub));
+        reportSubSizeMismatch(size, mCtx.leftSub);
     getExact(p, size);
 }
 
@@ -264,7 +263,7 @@ void ESMReader::getRecHeader(uint32_t &flags)
 
     // Check that sizes add up
     if (mCtx.leftFile < mCtx.leftRec)
-        fail("Record size is larger than rest of file");
+        reportSubSizeMismatch(mCtx.leftFile, mCtx.leftRec);
 
     // Adjust number of bytes mCtx.left in file
     mCtx.leftFile -= mCtx.leftRec;
diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp
index 608222a1bb..a438dca0cd 100644
--- a/components/esm/esmreader.hpp
+++ b/components/esm/esmreader.hpp
@@ -258,7 +258,7 @@ public:
 
 private:
   [[noreturn]] void reportSubSizeMismatch(size_t want, size_t got) {
-          fail("subrecord size mismatch, requested " +
+          fail("record size mismatch, requested " +
                   std::to_string(want) +
                   ", got" +
                   std::to_string(got));