From 6d47c16ce0b82996b575327ca9c1e361bcd251b0 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 7 Apr 2025 20:06:34 +0200 Subject: [PATCH] log: Make sure LOG_CONTEXT_SET_LOG_LEVEL() can be nested --- src/basic/log-context.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/basic/log-context.h b/src/basic/log-context.h index 84339695bf..2b3a06aab6 100644 --- a/src/basic/log-context.h +++ b/src/basic/log-context.h @@ -75,8 +75,11 @@ size_t log_context_num_fields(void); void _reset_log_level(int *saved_log_level); +#define _LOG_CONTEXT_SET_LOG_LEVEL(level, l) \ + _cleanup_(_reset_log_level) _unused_ int l = log_set_max_level(level); + #define LOG_CONTEXT_SET_LOG_LEVEL(level) \ - _cleanup_(_reset_log_level) _unused_ int _saved_log_level_ = log_set_max_level(level); + _LOG_CONTEXT_SET_LOG_LEVEL(level, UNIQ_T(l, UNIQ)) #define LOG_CONTEXT_PUSH(...) \ LOG_CONTEXT_PUSH_STRV(STRV_MAKE(__VA_ARGS__))