diff --git a/src/core/linker.cpp b/src/core/linker.cpp index 524b2e8b6..0ba6c45d3 100644 --- a/src/core/linker.cpp +++ b/src/core/linker.cpp @@ -2,8 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include -#include -#include +#include "common/config.h" +#include "common/path_util.h" #include "common/logging/log.h" #include "common/string_util.h" #include "core/aerolib/aerolib.h" diff --git a/src/core/loader/symbols_resolver.cpp b/src/core/loader/symbols_resolver.cpp index 6c5ac118e..132b0c919 100644 --- a/src/core/loader/symbols_resolver.cpp +++ b/src/core/loader/symbols_resolver.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include "common/string_util.h" #include "common/io_file.h" #include "common/logging/log.h" #include "common/types.h" @@ -35,8 +35,7 @@ const SymbolRecord* SymbolsResolver::FindSymbol(const SymbolResolver& s) const { } void SymbolsResolver::DebugDump(const std::filesystem::path& file_name) { - Common::FS::IOFile f; - f.Open(file_name, Common::FS::FileAccessMode::Write, Common::FS::FileType::TextFile); + Common::FS::IOFile f{file_name, Common::FS::FileAccessMode::Write, Common::FS::FileType::TextFile}; for (const auto& symbol : m_symbols) { const auto ids = Common::SplitString(symbol.name, '#'); std::string nidName = ""; @@ -50,7 +49,6 @@ void SymbolsResolver::DebugDump(const std::filesystem::path& file_name) { symbol.virtual_address, ids.at(0), nidName, ids.at(1), ids.at(2), ids.at(3), ids.at(4), ids.at(5), ids.at(6))); } - f.Close(); } } // namespace Core::Loader diff --git a/src/core/loader/symbols_resolver.h b/src/core/loader/symbols_resolver.h index 004fad348..09428daf7 100644 --- a/src/core/loader/symbols_resolver.h +++ b/src/core/loader/symbols_resolver.h @@ -44,7 +44,7 @@ public: static std::string GenerateName(const SymbolResolver& s); - static std::string SymbolTypeToS(SymbolType sym_type) { + static std::string_view SymbolTypeToS(SymbolType sym_type) { switch (sym_type) { case SymbolType::Unknown: return "Unknown";