OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strat: remove sizeof() / sizeof([0])

Browse Source
This commit is contained in:
Michael Scire
2019-07-02 14:36:57 -07:00
committed by SciresM
parent a5da286351
commit c916a7db88
10 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stratosphere/dmnt/source/dmnt_cheat_manager.cpp
View File

@@ -356,7 +356,7 @@ bool DmntCheatManager::ParseCheats(const char *s, size_t len) {
}
/* Bounds check the opcode count. */
if (cur_entry->definition.num_opcodes >= sizeof(cur_entry->definition.opcodes)/sizeof(cur_entry->definition.opcodes[0])) {
if (cur_entry->definition.num_opcodes >= sts::util::size(cur_entry->definition.opcodes)) {
return false;
}
@@ -662,7 +662,7 @@ Result DmntCheatManager::AddCheat(u32 *out_id, CheatDefinition *def, bool enable
return ResultDmntCheatNotAttached;
}
if (def->num_opcodes == 0 || def->num_opcodes > sizeof(def->opcodes)/sizeof(def->opcodes[0])) {
if (def->num_opcodes == 0 || def->num_opcodes > sts::util::size(def->opcodes)) {
return ResultDmntCheatInvalidCheat;
}
@@ -860,7 +860,7 @@ Result DmntCheatManager::ForceOpenCheatProcess() {
{
LoaderModuleInfo proc_modules[2];
u32 num_modules;
R_TRY(ldrDmntGetModuleInfos(g_cheat_process_metadata.process_id, proc_modules, sizeof(proc_modules)/sizeof(proc_modules[0]), &num_modules));
R_TRY(ldrDmntGetModuleInfos(g_cheat_process_metadata.process_id, proc_modules, sts::util::size(proc_modules), &num_modules));
/* All applications must have two modules. */
/* However, this is a force-open, so we will accept one module. */
@@ -949,7 +949,7 @@ void DmntCheatManager::OnNewApplicationLaunch() {
{
LoaderModuleInfo proc_modules[2];
u32 num_modules;
R_ASSERT(ldrDmntGetModuleInfos(g_cheat_process_metadata.process_id, proc_modules, sizeof(proc_modules)/sizeof(proc_modules[0]), &num_modules));
R_ASSERT(ldrDmntGetModuleInfos(g_cheat_process_metadata.process_id, proc_modules, sts::util::size(proc_modules), &num_modules));
/* All applications must have two modules. */
/* If we only have one, we must be e.g. mitming HBL. */