RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace verify() with ensure() with auto src location.

Browse source 
Expression ensure(x) returns x.
Using comma operator removed.
This commit is contained in:
Nekotekina 2020-12-09 10:47:45 +03:00
parent 38745e5782
commit e055d16b2c
121 changed files with 693 additions and 690 deletions
Download patch file Download diff file Expand all files Collapse all files

45
rpcs3/Loader/PSF.cpp
View file

@ -45,7 +45,8 @@ namespace psf
, m_max_size(max_size)
, m_value_string(value)
{
verify(HERE), type == format::string || type == format::array, max_size;
ensure(type == format::string || type == format::array);
ensure(max_size);
}
entry::entry(u32 value)
@ -61,26 +62,26 @@ namespace psf
const std::string& entry::as_string() const
{
verify(HERE), m_type == format::string || m_type == format::array;
ensure(m_type == format::string || m_type == format::array);
return m_value_string;
}
u32 entry::as_integer() const
{
verify(HERE), m_type == format::integer;
ensure(m_type == format::integer);
return m_value_integer;
}
entry& entry::operator =(const std::string& value)
{
verify(HERE), m_type == format::string || m_type == format::array;
ensure(m_type == format::string || m_type == format::array);
m_value_string = value;
return *this;
}
entry& entry::operator =(u32 value)
{
verify(HERE), m_type == format::integer;
ensure(m_type == format::integer);
m_value_integer = value;
return *this;
}
@ -112,39 +113,37 @@ namespace psf
// Get header
header_t header;
verify(HERE), stream.read(header);
ensure(stream.read(header));
// Check magic and version
verify(HERE),
header.magic == "\0PSF"_u32,
header.version == 0x101u,
sizeof(header_t) + header.entries_num * sizeof(def_table_t) <= header.off_key_table,
header.off_key_table <= header.off_data_table,
header.off_data_table <= stream.size();
ensure(header.magic == "\0PSF"_u32);
ensure(header.version == 0x101u);
ensure(sizeof(header_t) + header.entries_num * sizeof(def_table_t) <= header.off_key_table);
ensure(header.off_key_table <= header.off_data_table);
ensure(header.off_data_table <= stream.size());
// Get indices
std::vector<def_table_t> indices;
verify(HERE), stream.read(indices, header.entries_num);
ensure(stream.read(indices, header.entries_num));
// Get keys
std::string keys;
verify(HERE), stream.seek(header.off_key_table) == header.off_key_table;
verify(HERE), stream.read(keys, header.off_data_table - header.off_key_table);
ensure(stream.seek(header.off_key_table) == header.off_key_table);
ensure(stream.read(keys, header.off_data_table - header.off_key_table));
// Load entries
for (u32 i = 0; i < header.entries_num; ++i)
{
verify(HERE), indices[i].key_off < header.off_data_table - header.off_key_table;
ensure(indices[i].key_off < header.off_data_table - header.off_key_table);
// Get key name (null-terminated string)
std::string key(keys.data() + indices[i].key_off);
// Check entry
verify(HERE),
result.count(key) == 0,
indices[i].param_len <= indices[i].param_max,
indices[i].data_off < stream.size() - header.off_data_table,
indices[i].param_max < stream.size() - indices[i].data_off;
ensure(result.count(key) == 0);
ensure(indices[i].param_len <= indices[i].param_max);
ensure(indices[i].data_off < stream.size() - header.off_data_table);
ensure(indices[i].param_max < stream.size() - indices[i].data_off);
// Seek data pointer
stream.seek(header.off_data_table + indices[i].data_off);
@ -153,7 +152,7 @@ namespace psf
{
// Integer data
le_t<u32> value;
verify(HERE), stream.read(value);
ensure(stream.read(value));
result.emplace(std::piecewise_construct,
std::forward_as_tuple(std::move(key)),
@ -163,7 +162,7 @@ namespace psf
{
// String/array data
std::string value;
verify(HERE), stream.read(value, indices[i].param_len);
ensure(stream.read(value, indices[i].param_len));
if (indices[i].param_fmt == format::string)
{