From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 28 Jul 2021 16:26:59 +0000 (+0200)
Subject: lib/log.h nit: tweak macro for __LINE__
X-Git-Tag: v5.4.0~2^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e430cc78e285949fc4bfae06382cba80cb0beed;p=thirdparty%2Fknot-resolver.git

lib/log.h nit: tweak macro for __LINE__

- we don't need doubling the layer in this case,
  as the SD_JOURNAL_METADATA macro adds a layer already
- `TO_STR` was perhaps a too short name and could collide
---

diff --git a/lib/log.h b/lib/log.h
index 3a0e3c7a5..65901b69e 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -150,9 +150,9 @@ void kr_log_level_set(kr_log_level_t level);
 KR_EXPORT
 void kr_log_target_set(kr_log_target_t target);
 
-#define TO_STR_A(x) #x
-#define TO_STR(x) TO_STR_A(x)
-#define SD_JOURNAL_METADATA "CODE_FILE=" __FILE__, "CODE_LINE=" TO_STR(__LINE__), ""
+#define KR_LOG_SJM_STR(x) #x
+#define SD_JOURNAL_METADATA "CODE_FILE=" __FILE__, "CODE_LINE=" KR_LOG_SJM_STR(__LINE__), ""
+
 
 /**
  * Logging function for user modules. Uses group LOG_GRP_MODULE and ``info`` level.