From 83069a3c0f01507acd24672c90b24c9eba868aba Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Mon, 11 Nov 2019 10:38:15 +0100 Subject: Remove ERR_EXPLAIN macros and the scaffolding they needed. --- core/error_macros.cpp | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) (limited to 'core/error_macros.cpp') diff --git a/core/error_macros.cpp b/core/error_macros.cpp index 71517a47ec..55a215cfb6 100644 --- a/core/error_macros.cpp +++ b/core/error_macros.cpp @@ -34,25 +34,8 @@ #include "core/ustring.h" #include "os/os.h" -bool _err_error_exists = false; - static ErrorHandlerList *error_handler_list = NULL; -void _err_set_last_error(const char *p_err) { - - OS::get_singleton()->set_last_error(p_err); -} - -void _err_set_last_error(const String &p_err) { - - _err_set_last_error(p_err.utf8().get_data()); -} - -void _err_clear_last_error() { - - OS::get_singleton()->clear_last_error(); -} - void add_error_handler(ErrorHandlerList *p_handler) { _global_lock(); @@ -86,27 +69,11 @@ void remove_error_handler(ErrorHandlerList *p_handler) { } void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, ErrorHandlerType p_type) { - - OS::get_singleton()->print_error(p_function, p_file, p_line, p_error, _err_error_exists ? OS::get_singleton()->get_last_error() : "", (Logger::ErrorType)p_type); - - _global_lock(); - ErrorHandlerList *l = error_handler_list; - while (l) { - - l->errfunc(l->userdata, p_function, p_file, p_line, p_error, _err_error_exists ? OS::get_singleton()->get_last_error() : "", p_type); - l = l->next; - } - - _global_unlock(); - - if (_err_error_exists) { - OS::get_singleton()->clear_last_error(); - _err_error_exists = false; - } + _err_print_error(p_function, p_file, p_line, p_error, "", p_type); } void _err_print_error(const char *p_function, const char *p_file, int p_line, const String &p_error, ErrorHandlerType p_type) { - _err_print_error(p_function, p_file, p_line, p_error.utf8().get_data(), p_type); + _err_print_error(p_function, p_file, p_line, p_error.utf8().get_data(), "", p_type); } void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const char *p_message, ErrorHandlerType p_type) { -- cgit v1.2.3