Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clarify unknown type log message

Browse source
This commit is contained in:
Megamouse 2023-02-02 19:54:05 +01:00
parent 68dd25a4a5
commit 13ef4c1236
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Crypto/unpkg.cpp
View file

@ -785,9 +785,14 @@ bool package_reader::fill_data(std::map<std::string, install_entry*>& all_instal
const std::string name{reinterpret_cast<char*>(m_bufs.back().get()), entry.name_size}; const std::string name{reinterpret_cast<char*>(m_bufs.back().get()), entry.name_size};
std::string path = m_install_path + vfs::escape(name); std::string path = m_install_path + vfs::escape(name);
const bool log_error = entry.pad || (entry.type & ~PKG_FILE_ENTRY_KNOWN_BITS); if (entry.pad || (entry.type & ~PKG_FILE_ENTRY_KNOWN_BITS))
{
(log_error ? pkg_log.error : pkg_log.notice)("Entry 0x%08x: %s (pad=0x%x)", entry.type, name, entry.pad); pkg_log.todo("Entry with unknown type or padding: type=0x%08x, pad=0x%x, name='%s'", entry.type, entry.pad, name);
}
else
{
pkg_log.notice("Entry: type=0x%08x, name='%s'", entry.type, name);
}
const u8 entry_type = entry.type & 0xff; const u8 entry_type = entry.type & 0xff;
@ -894,8 +899,14 @@ void package_reader::extract_worker(thread_key thread_data_key)
const std::string& path = entry.weak_reference->first; const std::string& path = entry.weak_reference->first;
const std::string& name = entry.name; const std::string& name = entry.name;
const bool log_error = entry.pad || (entry.type & ~PKG_FILE_ENTRY_KNOWN_BITS); if (entry.pad || (entry.type & ~PKG_FILE_ENTRY_KNOWN_BITS))
(log_error ? pkg_log.error : pkg_log.notice)("Entry 0x%08x: %s (pad=0x%x)", entry.type, name, entry.pad); {
pkg_log.todo("Entry with unknown type or padding: type=0x%08x, pad=0x%x, name='%s'", entry.type, entry.pad, name);
}
else
{
pkg_log.notice("Entry: type=0x%08x, name='%s'", entry.type, name);
}
switch (const u8 entry_type = entry.type & 0xff) switch (const u8 entry_type = entry.type & 0xff)
{ {