From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 13 Jul 2021 11:18:18 +0000 (+0200)
Subject: lib/utils: drop a pair of unused macros
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d17790feed77349bee4793fa1f32b6e3eec5706f;p=thirdparty%2Fknot-resolver.git

lib/utils: drop a pair of unused macros
---

diff --git a/lib/log.c b/lib/log.c
index d99a17a42..d03158aa3 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -251,6 +251,11 @@ void kr_log_init(log_level_t level, log_target_t target)
 	kr_log_level_set(level);
 }
 
+static inline bool req_has_trace_log(const struct kr_request *req)
+{
+	return unlikely(req && req->trace_log);
+}
+
 static void kr_vlog_req(
 	const struct kr_request * const req, uint32_t qry_uid,
 	const unsigned int indent, enum kr_log_group group, const char *tag, const char *fmt,
@@ -264,7 +269,7 @@ static void kr_vlog_req(
 
 	msg = mp_vprintf_append(mp, msg, fmt, args);
 
-	if (kr_log_rtrace_enabled(req))
+	if (req_has_trace_log(req))
 		req->trace_log(req, msg);
 
 	kr_log_fmt(group, LOG_DEBUG, SD_JOURNAL_METADATA, "[%-6s]%s", tag, msg);
@@ -283,7 +288,7 @@ void kr_log_req1(const struct kr_request * const req, uint32_t qry_uid,
 
 bool kr_log_is_debug_fun(enum kr_log_group group, const struct kr_request *req)
 {
-	return kr_log_rtrace_enabled(req)
+	return req_has_trace_log(req)
 		|| kr_log_group_is_set(group)
 		|| KR_LOG_LEVEL_IS(LOG_DEBUG);
 }
diff --git a/lib/utils.h b/lib/utils.h
index b472935e2..9232da304 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -94,17 +94,6 @@ static inline bool kr_assert_func(bool result, const char *expr, const char *fun
 	return result;
 }
 
-/**
- * @brief Return true if the query has request log handler installed.
- */
-#define kr_log_rtrace_enabled(req) (__builtin_expect( \
-	(req) && (req)->trace_log, \
-	false))
-
-#define kr_log_qtrace_enabled(qry) (__builtin_expect( \
-	(qry) && kr_log_rtrace_enabled(qry->request), \
-	false))
-
 #define KR_DNAME_GET_STR(dname_str, dname) \
 	char dname_str[KR_DNAME_STR_MAXLEN]; \
 	knot_dname_to_str(dname_str, (dname), sizeof(dname_str)); \