Merge pull request #1886 from MaddTheSane/morePrintfLike

More printflike macros
This commit is contained in:
Connor McLaughlin
2021-04-01 02:29:05 +10:00
committed by GitHub
9 changed files with 27 additions and 26 deletions

View File

@ -148,7 +148,7 @@ void DisassembleAndLog(u32 addr);
void DisassembleAndPrint(u32 addr, u32 instructions_before, u32 instructions_after);
// Write to CPU execution log file.
void WriteToExecutionLog(const char* format, ...);
void WriteToExecutionLog(const char* format, ...) printflike(1, 2);
// Trace Routines
bool IsTraceEnabled();

View File

@ -101,7 +101,7 @@ bool HostInterface::BootSystem(const SystemBootParameters& parameters)
if (!AcquireHostDisplay())
{
ReportFormattedError(g_host_interface->TranslateString("System", "Failed to acquire host display."));
ReportError(g_host_interface->TranslateString("System", "Failed to acquire host display."));
OnSystemDestroyed();
return false;
}
@ -118,7 +118,7 @@ bool HostInterface::BootSystem(const SystemBootParameters& parameters)
{
if (!System::IsStartupCancelled())
{
ReportFormattedError(
ReportError(
g_host_interface->TranslateString("System", "System failed to boot. The log may contain more information."));
}

View File

@ -64,23 +64,23 @@ public:
virtual void ReportDebuggerMessage(const char* message);
virtual bool ConfirmMessage(const char* message);
void ReportFormattedError(const char* format, ...);
void ReportFormattedMessage(const char* format, ...);
void ReportFormattedDebuggerMessage(const char* format, ...);
bool ConfirmFormattedMessage(const char* format, ...);
void ReportFormattedError(const char* format, ...) printflike(2, 3);
void ReportFormattedMessage(const char* format, ...) printflike(2, 3);
void ReportFormattedDebuggerMessage(const char* format, ...) printflike(2, 3);
bool ConfirmFormattedMessage(const char* format, ...) printflike(2, 3);
/// Adds OSD messages, duration is in seconds.
virtual void AddOSDMessage(std::string message, float duration = 2.0f);
void AddFormattedOSDMessage(float duration, const char* format, ...);
void AddFormattedOSDMessage(float duration, const char* format, ...) printflike(3, 4);
/// Returns the base user directory path.
ALWAYS_INLINE const std::string& GetUserDirectory() const { return m_user_directory; }
/// Returns a path relative to the user directory.
std::string GetUserDirectoryRelativePath(const char* format, ...) const;
std::string GetUserDirectoryRelativePath(const char* format, ...) const printflike(2, 3);
/// Returns a path relative to the application directory (for system files).
std::string GetProgramDirectoryRelativePath(const char* format, ...) const;
std::string GetProgramDirectoryRelativePath(const char* format, ...) const printflike(2, 3);
/// Returns a string which can be used as part of a filename, based on the current date/time.
static TinyString GetTimestampStringForFileName();