os: const-qualify string arguments (#111)

Avoids the need to cast away const from string literals.
This commit is contained in:
LC 2021-01-31 22:25:03 -05:00 committed by GitHub
parent b595f0d0bf
commit f15faab756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions

View File

@ -154,13 +154,13 @@ s32 OSGetResetCode(void);
u32 OSGetSoundMode(void);
void OSSetSoundMode(OSSoundMode mode);
void OSAttention(char* msg, ...);
void OSPanic(char* file, s32 line, char* fmt, ...);
void OSReport(char* fmt, ...);
void OSReport_Error(char* fmt, ...);
void OSReport_FatalError(char* fmt, ...);
void OSReport_System(char* fmt, ...);
void OSReport_Warning(char* fmt, ...);
void OSAttention(const char* msg, ...);
void OSPanic(const char* file, s32 line, const char* fmt, ...);
void OSReport(const char* fmt, ...);
void OSReport_Error(const char* fmt, ...);
void OSReport_FatalError(const char* fmt, ...);
void OSReport_System(const char* fmt, ...);
void OSReport_Warning(const char* fmt, ...);
void OSReportDisable(void);
void OSReportEnable(void);
void OSReportForceEnableOff(void);

View File

@ -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);
}
}
}

View File

@ -61,7 +61,7 @@ void version_check(void) {
return;
}
OSReport_Error((char*)"SDKのバージョンが一致しません。停止します\n");
OSReport_Error("SDKのバージョンが一致しません。停止します\n");
do {
} while (true);
}

View File

@ -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"
}