Log PSF path on error

This commit is contained in:
Megamouse 2022-11-27 08:59:57 +01:00
parent 49a968219f
commit 5dbadccd7f
10 changed files with 35 additions and 31 deletions

View file

@ -157,9 +157,9 @@ namespace psf
fmt::throw_exception("Invalid format (0x%x)", m_type);
}
load_result_t load(const fs::file& stream)
load_result_t load(const fs::file& stream, std::string_view filename)
{
#define PSF_CHECK(cond, err) if (!static_cast<bool>(cond)) { if (error::err != error::stream) psf_log.error("Error loading PSF: %s%s", error::err, \
#define PSF_CHECK(cond, err) if (!static_cast<bool>(cond)) { if (error::err != error::stream) psf_log.error("Error loading PSF '%s': %s%s", filename, error::err, \
src_loc{__builtin_LINE(), __builtin_COLUMN(), __builtin_FILE(), __builtin_FUNCTION()}); \
result.clear(); \
errc = error::err; \
@ -257,7 +257,7 @@ namespace psf
load_result_t load(const std::string& filename)
{
return load(fs::file(filename));
return load(fs::file(filename), filename);
}
std::vector<u8> save_object(const psf::registry& psf, std::vector<u8>&& init)