Update PluginInformation to return std::optional instead of raw pointer

This commit is contained in:
Maschell 2023-11-05 13:31:22 +01:00
parent cc5acd0980
commit 36e99e95a2

View File

@ -78,11 +78,11 @@ public:
return mSectionInfoList; return mSectionInfoList;
} }
[[nodiscard]] SectionInfo *getSectionInfo(const std::string &sectionName) const { [[nodiscard]] std::optional<SectionInfo> getSectionInfo(const std::string &sectionName) const {
if (getSectionInfoList().contains(sectionName)) { if (getSectionInfoList().contains(sectionName)) {
return mSectionInfoList.at(sectionName).get(); return *mSectionInfoList.at(sectionName);
} }
return nullptr; return std::nullopt;
} }
void setTrampolineId(uint8_t trampolineId) { void setTrampolineId(uint8_t trampolineId) {
@ -93,7 +93,7 @@ public:
return mTrampolineId; return mTrampolineId;
} }
[[nodiscard]] FunctionSymbolData *getNearestFunctionSymbolData(uint32_t address) const { [[nodiscard]] std::optional<FunctionSymbolData> getNearestFunctionSymbolData(uint32_t address) const {
FunctionSymbolData *result = nullptr; FunctionSymbolData *result = nullptr;
bool foundHit = false; bool foundHit = false;
@ -106,8 +106,11 @@ public:
foundHit = true; foundHit = true;
} }
} }
if (!foundHit) {
return std::nullopt;
}
return result; return *result;
} }
[[nodiscard]] const HeapMemoryFixedSize &getTextMemory() const { [[nodiscard]] const HeapMemoryFixedSize &getTextMemory() const {