diff options
Diffstat (limited to 'src/common/Debugging/Errors.cpp')
| -rw-r--r-- | src/common/Debugging/Errors.cpp | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/src/common/Debugging/Errors.cpp b/src/common/Debugging/Errors.cpp index bf7c443f23..1a9e7d63ea 100644 --- a/src/common/Debugging/Errors.cpp +++ b/src/common/Debugging/Errors.cpp @@ -57,73 +57,73 @@ namespace namespace acore { -void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message) -{ - std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + debugInfo + '\n'; - fprintf(stderr, "%s", formattedMessage.c_str()); - fflush(stderr); - Crash(formattedMessage.c_str()); -} + void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message) + { + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + debugInfo + '\n'; + fprintf(stderr, "%s", formattedMessage.c_str()); + fflush(stderr); + Crash(formattedMessage.c_str()); + } -void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message, char const* format, ...) -{ - va_list args; - va_start(args, format); + void Assert(char const* file, int line, char const* function, std::string const& debugInfo, char const* message, char const* format, ...) + { + va_list args; + va_start(args, format); - std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + FormatAssertionMessage(format, args) + '\n' + debugInfo + '\n'; - va_end(args); + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ASSERTION FAILED:\n %s\n", file, line, function, message) + FormatAssertionMessage(format, args) + '\n' + debugInfo + '\n'; + va_end(args); - fprintf(stderr, "%s", formattedMessage.c_str()); - fflush(stderr); + fprintf(stderr, "%s", formattedMessage.c_str()); + fflush(stderr); - Crash(formattedMessage.c_str()); -} + Crash(formattedMessage.c_str()); + } -void Fatal(char const* file, int line, char const* function, char const* message, ...) -{ - va_list args; - va_start(args, message); + void Fatal(char const* file, int line, char const* function, char const* message, ...) + { + va_list args; + va_start(args, message); - std::string formattedMessage = acore::StringFormat("\n%s:%i in %s FATAL ERROR:\n", file, line, function) + FormatAssertionMessage(message, args) + '\n'; - va_end(args); + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s FATAL ERROR:\n", file, line, function) + FormatAssertionMessage(message, args) + '\n'; + va_end(args); - fprintf(stderr, "%s", formattedMessage.c_str()); - fflush(stderr); + fprintf(stderr, "%s", formattedMessage.c_str()); + fflush(stderr); - std::this_thread::sleep_for(std::chrono::seconds(10)); - Crash(formattedMessage.c_str()); -} + std::this_thread::sleep_for(std::chrono::seconds(10)); + Crash(formattedMessage.c_str()); + } -void Error(char const* file, int line, char const* function, char const* message) -{ - std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ERROR:\n %s\n", file, line, function, message); - fprintf(stderr, "%s", formattedMessage.c_str()); - fflush(stderr); - Crash(formattedMessage.c_str()); -} + void Error(char const* file, int line, char const* function, char const* message) + { + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ERROR:\n %s\n", file, line, function, message); + fprintf(stderr, "%s", formattedMessage.c_str()); + fflush(stderr); + Crash(formattedMessage.c_str()); + } -void Warning(char const* file, int line, char const* function, char const* message) -{ - fprintf(stderr, "\n%s:%i in %s WARNING:\n %s\n", - file, line, function, message); -} + void Warning(char const* file, int line, char const* function, char const* message) + { + fprintf(stderr, "\n%s:%i in %s WARNING:\n %s\n", + file, line, function, message); + } -void Abort(char const* file, int line, char const* function) -{ - std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ABORTED.\n", file, line, function); - fprintf(stderr, "%s", formattedMessage.c_str()); - fflush(stderr); - Crash(formattedMessage.c_str()); -} + void Abort(char const* file, int line, char const* function) + { + std::string formattedMessage = acore::StringFormat("\n%s:%i in %s ABORTED.\n", file, line, function); + fprintf(stderr, "%s", formattedMessage.c_str()); + fflush(stderr); + Crash(formattedMessage.c_str()); + } -void AbortHandler(int sigval) -{ - // nothing useful to log here, no way to pass args - std::string formattedMessage = acore::StringFormat("Caught signal %i\n", sigval); - fprintf(stderr, "%s", formattedMessage.c_str()); - fflush(stderr); - Crash(formattedMessage.c_str()); -} + void AbortHandler(int sigval) + { + // nothing useful to log here, no way to pass args + std::string formattedMessage = acore::StringFormat("Caught signal %i\n", sigval); + fprintf(stderr, "%s", formattedMessage.c_str()); + fflush(stderr); + Crash(formattedMessage.c_str()); + } } // namespace acore |
