mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 13:20:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix coverity issue about uninitialized members of LevelledListBase

Browse Source 
* Remove explicit constructor.
* Use static constexpr where possible.
* Use CRTP to get RecName.
This commit is contained in:
elsid 2022-02-23 20:06:29 +01:00
parent 34be9329eb
commit 3c66a927d8
No known key found for this signature in database
GPG Key ID: B845CB9FEE18AB40
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/esm3/loadlevlist.cpp
View File

@ -6,7 +6,7 @@
namespace ESM namespace ESM
{ {
void LevelledListBase::load(ESMReader &esm, bool &isDeleted) void LevelledListBase::load(ESMReader& esm, ESM::NAME recName, bool& isDeleted)
{ {
isDeleted = false; isDeleted = false;
mRecordFlags = esm.getRecordFlags(); mRecordFlags = esm.getRecordFlags();
@ -43,7 +43,7 @@ namespace ESM
for (size_t i = 0; i < mList.size(); i++) for (size_t i = 0; i < mList.size(); i++)
{ {
LevelItem &li = mList[i]; LevelItem &li = mList[i];
li.mId = esm.getHNString(mRecName); li.mId = esm.getHNString(recName);
esm.getHNT(li.mLevel, "INTV"); esm.getHNT(li.mLevel, "INTV");
} }
@ -75,7 +75,7 @@ namespace ESM
esm.fail("Missing NAME subrecord"); esm.fail("Missing NAME subrecord");
} }
void LevelledListBase::save(ESMWriter &esm, bool isDeleted) const void LevelledListBase::save(ESMWriter& esm, ESM::NAME recName, bool isDeleted) const
{ {
esm.writeHNCString("NAME", mId); esm.writeHNCString("NAME", mId);
@ -91,7 +91,7 @@ namespace ESM
for (std::vector<LevelItem>::const_iterator it = mList.begin(); it != mList.end(); ++it) for (std::vector<LevelItem>::const_iterator it = mList.begin(); it != mList.end(); ++it)
{ {
esm.writeHNCString(mRecName, it->mId); esm.writeHNCString(recName, it->mId);
esm.writeHNT("INTV", it->mLevel); esm.writeHNT("INTV", it->mLevel);
} }
} }
@ -102,8 +102,4 @@ namespace ESM
mChanceNone = 0; mChanceNone = 0;
mList.clear(); mList.clear();
} }
unsigned int CreatureLevList::sRecordId = REC_LEVC;
unsigned int ItemLevList::sRecordId = REC_LEVI;
} }

34
components/esm3/loadlevlist.hpp
View File

@ -5,6 +5,7 @@
#include <vector> #include <vector>
#include <components/esm/esmcommon.hpp> #include <components/esm/esmcommon.hpp>
#include <components/esm/defs.hpp>
namespace ESM namespace ESM
{ {
@ -27,10 +28,6 @@ struct LevelledListBase
unsigned int mRecordFlags; unsigned int mRecordFlags;
std::string mId; std::string mId;
// Record name used to read references. Must be set before load() is
// called.
ESM::NAME mRecName;
struct LevelItem struct LevelItem
{ {
std::string mId; std::string mId;
@ -39,18 +36,25 @@ struct LevelledListBase
std::vector<LevelItem> mList; std::vector<LevelItem> mList;
explicit LevelledListBase(ESM::NAME recName) : mRecName(recName) {} void load(ESMReader& esm, ESM::NAME recName, bool& isDeleted);
void save(ESMWriter& esm, ESM::NAME recName, bool isDeleted) const;
void load(ESMReader &esm, bool &isDeleted);
void save(ESMWriter &esm, bool isDeleted = false) const;
void blank(); void blank();
///< Set record to default state (does not touch the ID). ///< Set record to default state (does not touch the ID).
}; };
struct CreatureLevList: LevelledListBase template <class Base>
struct CustomLevelledListBase : LevelledListBase
{ {
static unsigned int sRecordId; void load(ESMReader &esm, bool& isDeleted) { LevelledListBase::load(esm, Base::sRecName, isDeleted); }
void save(ESMWriter &esm, bool isDeleted = false) const { LevelledListBase::save(esm, Base::sRecName, isDeleted); }
};
struct CreatureLevList : CustomLevelledListBase<CreatureLevList>
{
/// Record name used to read references.
static constexpr ESM::NAME sRecName {"CNAM"};
static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVC;
/// Return a string descriptor for this record type. Currently used for debugging / error logs only. /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
static std::string_view getRecordType() { return "CreatureLevList"; } static std::string_view getRecordType() { return "CreatureLevList"; }
@ -61,13 +65,13 @@ struct CreatureLevList: LevelledListBase
// level, not just the closest below // level, not just the closest below
// player. // player.
}; };
CreatureLevList() : LevelledListBase("CNAM") {}
}; };
struct ItemLevList: LevelledListBase struct ItemLevList : CustomLevelledListBase<ItemLevList>
{ {
static unsigned int sRecordId; /// Record name used to read references.
static constexpr ESM::NAME sRecName {"INAM"};
static constexpr RecNameInts sRecordId = RecNameInts::REC_LEVI;
/// Return a string descriptor for this record type. Currently used for debugging / error logs only. /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
static std::string_view getRecordType() { return "ItemLevList"; } static std::string_view getRecordType() { return "ItemLevList"; }
@ -84,8 +88,6 @@ struct ItemLevList: LevelledListBase
// level, not just the closest below // level, not just the closest below
// player. // player.
}; };
ItemLevList() : LevelledListBase("INAM") {}
}; };
} }