summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2021-01-31 22:25:03 -0500
committerGitHub <noreply@github.com>2021-01-31 22:25:03 -0500
commitf15faab7566d7e69eedeb64e917bdd06775ecc46 (patch)
tree1baf597e5b6f01cc35a1a472709c45745facdcfb /src
parentb595f0d0bf2bde1d0e55cc1f6cfc5df71cb07d98 (diff)
os: const-qualify string arguments (#111)
Avoids the need to cast away const from string literals.
Diffstat (limited to 'src')
-rw-r--r--src/d/d_save/d_save.cpp2
-rw-r--r--src/m_Do/m_Do_main.cpp2
-rw-r--r--src/m_Do/m_Do_printf.cpp14
3 files changed, 9 insertions, 9 deletions
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index 79d7960f23..0ee4b00adc 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -373,7 +373,7 @@ u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const {
}
// 合成アイテム不定===>%d, %d\n
// Uncertain combination item===>%d, %d\n
- OSReport_Error((char*)lbl_80379234 + 9, item_id_2, item_id_1);
+ OSReport_Error(lbl_80379234 + 9, item_id_2, item_id_1);
}
}
}
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 11b189dca0..757c2e9fb9 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -61,7 +61,7 @@ void version_check(void) {
return;
}
- OSReport_Error((char*)"SDK̃o[Wv܂B~܂\n");
+ OSReport_Error("SDK̃o[Wv܂B~܂\n");
do {
} while (true);
}
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index 9e97e64e2d..bf8aaac84e 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -17,7 +17,7 @@ void OSVAttention(const char* fmt, __va_list_struct* va_list) {
}
extern "C" {
-asm void OSAttention(char* msg, ...) {
+asm void OSAttention(const char* msg, ...) {
nofralloc
#include "m_Do/m_Do_printf/asm/func_80006814.s"
}
@@ -99,32 +99,32 @@ void OSVReport(const char* format, __va_list_struct* list) {
mDoPrintf_VReport(format, list);
}
-asm void OSReport(char* fmt, ...) {
+asm void OSReport(const char* fmt, ...) {
nofralloc
#include "m_Do/m_Do_printf/asm/func_80006ABC.s"
}
-asm void OSReport_FatalError(char* fmt, ...) {
+asm void OSReport_FatalError(const char* fmt, ...) {
nofralloc
#include "m_Do/m_Do_printf/asm/func_80006B3C.s"
}
-asm void OSReport_Error(char* fmt, ...) {
+asm void OSReport_Error(const char* fmt, ...) {
nofralloc
#include "m_Do/m_Do_printf/asm/func_80006C0C.s"
}
-asm void OSReport_Warning(char* fmt, ...) {
+asm void OSReport_Warning(const char* fmt, ...) {
nofralloc
#include "m_Do/m_Do_printf/asm/func_80006CEC.s"
}
-asm void OSReport_System(char* fmt, ...) {
+asm void OSReport_System(const char* fmt, ...) {
nofralloc
#include "m_Do/m_Do_printf/asm/func_80006DCC.s"
}
-asm void OSPanic(char* file, s32 line, char* fmt, ...) {
+asm void OSPanic(const char* file, s32 line, const char* fmt, ...) {
nofralloc
#include "m_Do/m_Do_printf/asm/func_80006E7C.s"
}