From c8acaac6a7ec2c03bbb73ca5eb4a471dba8ecd1e Mon Sep 17 00:00:00 2001 From: Maschell Date: Fri, 17 Feb 2023 11:55:57 +0100 Subject: [PATCH] Update logger file --- source/logger.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/source/logger.h b/source/logger.h index d863d84..3c0f1eb 100644 --- a/source/logger.h +++ b/source/logger.h @@ -2,14 +2,22 @@ #include #include -#define __FILENAME__ ({ \ - const char *filename = __FILE__; \ - const char *pos = strrchr(filename, '/'); \ - if (!pos) pos = strrchr(filename, '\\'); \ - pos ? pos + 1 : filename; \ +#define __FILENAME__ ({ \ + const char *__filename = __FILE__; \ + const char *__pos = strrchr(__filename, '/'); \ + if (!__pos) __pos = strrchr(__filename, '\\'); \ + __pos ? __pos + 1 : __filename; \ }) -#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...) \ - do { \ - OSReport("[(%s)%18s][%23s]%30s@L%04d: ## ERROR ## " FMT "\n", "M", "libwupsbackend", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \ +#define LOG_APP_TYPE "L" +#define LOG_APP_NAME "libwupsbackend" + +#define LOG_EX(FILENAME, FUNCTION, LINE, LOG_FUNC, LOG_LEVEL, LINE_END, FMT, ARGS...) \ + do { \ + LOG_FUNC("[(%s)%18s][%23s]%30s@L%04d: " LOG_LEVEL "" FMT "" LINE_END, LOG_APP_TYPE, LOG_APP_NAME, FILENAME, FUNCTION, LINE, ##ARGS); \ } while (0) + +#define LOG_EX_DEFAULT(LOG_FUNC, LOG_LEVEL, LINE_END, FMT, ARGS...) LOG_EX(__FILENAME__, __FUNCTION__, __LINE__, LOG_FUNC, LOG_LEVEL, LINE_END, FMT, ##ARGS) + +#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...) LOG_EX_DEFAULT(OSReport, "##ERROR## ", "\n", FMT, ##ARGS) +#define DEBUG_FUNCTION_LINE_WARN(FMT, ARGS...) LOG_EX_DEFAULT(OSReport, "##WARNING## ", "\n", FMT, ##ARGS)