From 77d7e6b1215627b93322f8c405fe8b345fdc3e38 Mon Sep 17 00:00:00 2001 From: Lusamine <30205550+Lusamine@users.noreply.github.com> Date: Wed, 25 Nov 2020 08:29:09 -0600 Subject: [PATCH] Correct some occurrences of "occured" (#1213) * Correct all occurrences of "occured" * Correct some occurrences of "occured" --- fusee/fusee-primary/src/exception_handlers.c | 2 +- fusee/fusee-secondary/src/exception_handlers.c | 2 +- sept/sept-secondary/src/exception_handlers.c | 2 +- stratosphere/fatal/source/fatal_config.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fusee/fusee-primary/src/exception_handlers.c b/fusee/fusee-primary/src/exception_handlers.c index 128425891..77303a4fa 100644 --- a/fusee/fusee-primary/src/exception_handlers.c +++ b/fusee/fusee-primary/src/exception_handlers.c @@ -89,7 +89,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) { uint32_t cpsr = registers[16]; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; - sprintf(exception_log, "An exception occured!\n"); + sprintf(exception_log, "An exception occurred!\n"); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); diff --git a/fusee/fusee-secondary/src/exception_handlers.c b/fusee/fusee-secondary/src/exception_handlers.c index 5ade0ba66..d22a3d9eb 100644 --- a/fusee/fusee-secondary/src/exception_handlers.c +++ b/fusee/fusee-secondary/src/exception_handlers.c @@ -90,7 +90,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) { uint32_t cpsr = registers[16]; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; - sprintf(exception_log, "An exception occured!\n"); + sprintf(exception_log, "An exception occurred!\n"); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); diff --git a/sept/sept-secondary/src/exception_handlers.c b/sept/sept-secondary/src/exception_handlers.c index 128425891..77303a4fa 100644 --- a/sept/sept-secondary/src/exception_handlers.c +++ b/sept/sept-secondary/src/exception_handlers.c @@ -89,7 +89,7 @@ void exception_handler_main(uint32_t *registers, unsigned int exception_type) { uint32_t cpsr = registers[16]; uint32_t instr_addr = pc + ((cpsr & 0x20) ? 2 : 4) - CODE_DUMP_SIZE; - sprintf(exception_log, "An exception occured!\n"); + sprintf(exception_log, "An exception occurred!\n"); code_dump_size = safecpy(code_dump, (const void *)instr_addr, CODE_DUMP_SIZE); stack_dump_size = safecpy(stack_dump, (const void *)registers[13], STACK_DUMP_SIZE); diff --git a/stratosphere/fatal/source/fatal_config.cpp b/stratosphere/fatal/source/fatal_config.cpp index 8b144a4be..3a04b92de 100644 --- a/stratosphere/fatal/source/fatal_config.cpp +++ b/stratosphere/fatal/source/fatal_config.cpp @@ -82,7 +82,7 @@ namespace ams::fatal::srv { { this->error_msg = "Error Code: 2%03d-%04d (0x%x)\n"; - this->error_desc = "An error has occured.\n\n" + this->error_desc = "An error has occurred.\n\n" "Please press the POWER Button to restart the console normally, or a VOL button\n" "to reboot to a payload (or RCM, if none is present). If you are unable to\n" "restart the console, hold the POWER Button for 12 seconds to turn the console off.\n\n"