From 3a66f45ed9a021fc767e8761c050e9b537b3c283 Mon Sep 17 00:00:00 2001 From: Vic Yang Date: Tue, 12 Jul 2022 14:48:00 +0000 Subject: [PATCH] pw_log_android: Ensure log level is expanded This adds one more indirection to PW_HANDLE_LOG to ensure the log level argument is expanded before used in _PW_LOG_ANDROID_LEVEL_*. Change-Id: I76857b7f8ab7e93b3b3314df17d682c0dbb8ec38 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/100088 Reviewed-by: Ewout van Bekkum Commit-Queue: Auto-Submit Pigweed-Auto-Submit: Vic Yang --- pw_log_android/public/pw_log_android/log_android.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pw_log_android/public/pw_log_android/log_android.h b/pw_log_android/public/pw_log_android/log_android.h index 410f149e6..966b2738b 100644 --- a/pw_log_android/public/pw_log_android/log_android.h +++ b/pw_log_android/public/pw_log_android/log_android.h @@ -39,5 +39,9 @@ // #define PW_LOG_LEVEL_FATAL 7 #define _PW_LOG_ANDROID_LEVEL_7(...) LOG_ALWAYS_FATAL(__VA_ARGS__) -#define PW_HANDLE_LOG(level, flags, ...) \ +#define _PW_HANDLE_LOG(level, flags, ...) \ _PW_LOG_ANDROID_LEVEL_##level(__VA_ARGS__) + +// The indirection through _PW_HANDLE_LOG ensures the `level` argument is +// expanded. +#define PW_HANDLE_LOG(...) _PW_HANDLE_LOG(__VA_ARGS__)