From 6140c9c3fda5d18cb5b99a0fb4cb8052974a4cb0 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 21 Jun 2021 20:06:45 +0000 Subject: [PATCH] Don't catch exceptions in EsmReader::getExact --- components/esm/esmreader.cpp | 12 ------------ components/esm/esmreader.hpp | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/components/esm/esmreader.cpp b/components/esm/esmreader.cpp index e5d239570e..e3e6a4f335 100644 --- a/components/esm/esmreader.cpp +++ b/components/esm/esmreader.cpp @@ -291,18 +291,6 @@ void ESMReader::getRecHeader(uint32_t &flags) * *************************************************************************/ -void ESMReader::getExact(void*x, int size) -{ - try - { - mEsm->read((char*)x, size); - } - catch (std::exception& e) - { - fail(std::string("Read error: ") + e.what()); - } -} - std::string ESMReader::getString(int size) { size_t s = size; diff --git a/components/esm/esmreader.hpp b/components/esm/esmreader.hpp index d3dd94516f..ea18014b77 100644 --- a/components/esm/esmreader.hpp +++ b/components/esm/esmreader.hpp @@ -239,7 +239,7 @@ public: template void getT(X &x) { getExact(&x, sizeof(X)); } - void getExact(void*x, int size); + void getExact(void* x, int size) { mEsm->read((char*)x, size); } void getName(NAME &name) { getT(name); } void getUint(uint32_t &u) { getT(u); }