From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 26 Jul 2021 17:21:50 +0000 (+0200)
Subject: lib/log.h: avoid defining types without kr_ prefix
X-Git-Tag: v5.4.0~2^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9eec44f7429e9f7c8b87a783f30ee2731836c638;p=thirdparty%2Fknot-resolver.git

lib/log.h: avoid defining types without kr_ prefix

Probably, it seems "more consistent".
Some defines still don't have it, but I left those.
---

diff --git a/daemon/engine.c b/daemon/engine.c
index 183e8a507..e5d02bac7 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -162,7 +162,7 @@ static int l_set_log_level(lua_State *L)
 		return 0;
 	}
 
-	log_level_t lvl = kr_log_name2level(lua_tostring(L, 1));
+	kr_log_level_t lvl = kr_log_name2level(lua_tostring(L, 1));
 	lvl = kr_log_level_set(lvl);
 
 	lua_pushstring(L, kr_log_level2name(lvl));
diff --git a/daemon/lua/kres-gen-29.lua b/daemon/lua/kres-gen-29.lua
index 73c5c9915..24d4b3a5e 100644
--- a/daemon/lua/kres-gen-29.lua
+++ b/daemon/lua/kres-gen-29.lua
@@ -306,7 +306,7 @@ struct kr_server_selection {
 	void (*error)(struct kr_query *, const struct kr_transport *, enum kr_selection_error);
 	struct local_state *local_state;
 };
-typedef int log_level_t;
+typedef int kr_log_level_t;
 enum kr_log_group {LOG_GRP_SYSTEM = 1, LOG_GRP_CACHE, LOG_GRP_IO, LOG_GRP_NETWORK, LOG_GRP_TA, LOG_GRP_TLS, LOG_GRP_GNUTLS, LOG_GRP_TLSCLIENT, LOG_GRP_XDP, LOG_GRP_ZIMPORT, LOG_GRP_ZSCANNER, LOG_GRP_DOH, LOG_GRP_DNSSEC, LOG_GRP_HINT, LOG_GRP_PLAN, LOG_GRP_ITERATOR, LOG_GRP_VALIDATOR, LOG_GRP_RESOLVER, LOG_GRP_SELECTION, LOG_GRP_ZCUT, LOG_GRP_COOKIES, LOG_GRP_STATISTICS, LOG_GRP_REBIND, LOG_GRP_WORKER, LOG_GRP_POLICY, LOG_GRP_TASENTINEL, LOG_GRP_TASIGNALING, LOG_GRP_TAUPDATE, LOG_GRP_DAF, LOG_GRP_DETECTTIMEJUMP, LOG_GRP_DETECTTIMESKEW, LOG_GRP_GRAPHITE, LOG_GRP_PREFILL, LOG_GRP_PRIMING, LOG_GRP_SRVSTALE, LOG_GRP_WATCHDOG, LOG_GRP_NSID, LOG_GRP_DNSTAP, LOG_GRP_TESTS, LOG_GRP_DOTAUTH, LOG_GRP_HTTP, LOG_GRP_CONTROL, LOG_GRP_MODULE, LOG_GRP_DEVEL};
 
 kr_layer_t kr_layer_t_static;
@@ -388,7 +388,7 @@ int kr_forward_add_target(struct kr_request *, const struct sockaddr *);
 void kr_log_req1(const struct kr_request * const, uint32_t, const unsigned int, enum kr_log_group, const char *, const char *, ...);
 void kr_log_q1(const struct kr_query * const, enum kr_log_group, const char *, const char *, ...);
 const char *kr_log_grp2name(enum kr_log_group);
-void kr_log_fmt(enum kr_log_group, log_level_t, const char *, const char *, const char *, const char *, ...);
+void kr_log_fmt(enum kr_log_group, kr_log_level_t, const char *, const char *, const char *, const char *, ...);
 int kr_make_query(struct kr_query *, knot_pkt_t *);
 void kr_pkt_make_auth_header(knot_pkt_t *);
 int kr_pkt_put(knot_pkt_t *, const knot_dname_t *, uint32_t, uint16_t, uint16_t, const uint8_t *, uint16_t);
diff --git a/daemon/lua/kres-gen.sh b/daemon/lua/kres-gen.sh
index 6bcc23110..3fb1f2078 100755
--- a/daemon/lua/kres-gen.sh
+++ b/daemon/lua/kres-gen.sh
@@ -138,7 +138,7 @@ ${CDEFS} ${LIBKRES} types <<-EOF
 	struct kr_prop
 	struct kr_module
 	struct kr_server_selection
-	log_level_t
+	kr_log_level_t
 	enum kr_log_group
 EOF
 
diff --git a/lib/log.c b/lib/log.c
index 1d02b2e30..92c520990 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -18,14 +18,20 @@
 int use_journal = 0;
 #endif
 
-log_level_t kr_log_level = LOG_CRIT;
-log_target_t kr_log_target = LOG_TARGET_STDOUT;
+kr_log_level_t kr_log_level = LOG_CRIT;
+kr_log_target_t kr_log_target = LOG_TARGET_STDOUT;
 
 /** Set of log-groups that are on debug level.  It's a bitmap over 1 << enum kr_log_group. */
 static uint64_t kr_log_groups = 0;
 
 static_assert(LOG_GRP_DEVEL <= 8 * sizeof(kr_log_groups), "Too many log groups.");
 
+
+typedef struct {
+	const char		*g_name;
+	enum kr_log_group	g_val;
+} log_group_names_t;
+
 #define GRP_NAME_ITEM(grp) { grp ## _TAG, grp }
 
 log_group_names_t log_group_names[] = {
@@ -95,7 +101,7 @@ bool kr_log_group_is_set(enum kr_log_group group)
 	return kr_log_groups & (1ULL << group);
 }
 
-void kr_log_fmt(enum kr_log_group group, log_level_t level, const char *file,
+void kr_log_fmt(enum kr_log_group group, kr_log_level_t level, const char *file,
 		const char *line, const char *func, const char *fmt, ...)
 {
 	va_list args;
@@ -141,7 +147,7 @@ static void kres_gnutls_log(int level, const char *message)
 	kr_log_debug(GNUTLS, "(%d) %s", level, message);
 }
 
-char *kr_log_level2name(log_level_t level)
+char *kr_log_level2name(kr_log_level_t level)
 {
 	for (int i = 0; prioritynames[i].c_name; ++i)
 	{
@@ -152,7 +158,7 @@ char *kr_log_level2name(log_level_t level)
 	return NULL;
 }
 
-log_level_t kr_log_name2level(const char *name)
+kr_log_level_t kr_log_name2level(const char *name)
 {
 	if (kr_fails_assert(name))
 		return -1;
@@ -205,7 +211,7 @@ static void kr_gnutls_log_level_set()
 	}
 }
 
-int kr_log_level_set(log_level_t level)
+int kr_log_level_set(kr_log_level_t level)
 {
 	if (level < LOG_CRIT || level > LOG_DEBUG) {
 		kr_log_warning(SYSTEM, "invalid log level\n");
@@ -221,7 +227,7 @@ int kr_log_level_set(log_level_t level)
 
 }
 
-log_level_t kr_log_level_get(void)
+kr_log_level_t kr_log_level_get(void)
 {
 	return kr_log_level;
 }
@@ -240,7 +246,7 @@ void kr_log_del_group(enum kr_log_group group)
 		kr_gnutls_log_level_set();
 }
 
-void kr_log_init(log_level_t level, log_target_t target)
+void kr_log_init(kr_log_level_t level, kr_log_target_t target)
 {
 	kr_log_target = target;
 	kr_log_groups = 0;
diff --git a/lib/log.h b/lib/log.h
index 3b72dabb8..060185899 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -17,7 +17,7 @@ typedef enum {
 	LOG_TARGET_SYSLOG = 0,
 	LOG_TARGET_STDERR = 1,
 	LOG_TARGET_STDOUT = 2,
-} log_target_t;
+} kr_log_target_t;
 
 /* Groups */
 
@@ -71,11 +71,6 @@ enum kr_log_group {
 	LOG_GRP_DEVEL,  /* Must be last entry in enum! */
 };
 
-typedef struct {
-	const char		*g_name;
-	enum kr_log_group	g_val;
-} log_group_names_t;
-
 /**
  * @name Group names
  */
@@ -139,21 +134,21 @@ enum kr_log_group kr_log_name2grp(const char *name);
 
 /* Log */
 
-typedef int log_level_t;
+typedef int kr_log_level_t;
 
 KR_EXPORT
-extern log_level_t kr_log_level;
+extern kr_log_level_t kr_log_level;
 KR_EXPORT
-extern log_target_t kr_log_target;
+extern kr_log_target_t kr_log_target;
 KR_EXPORT KR_PRINTF(6)
-void kr_log_fmt(enum kr_log_group group, log_level_t level, const char *file, const char *line,
+void kr_log_fmt(enum kr_log_group group, kr_log_level_t level, const char *file, const char *line,
 		const char *func, const char *fmt, ...);
 KR_EXPORT
-int kr_log_level_set(log_level_t level);
+int kr_log_level_set(kr_log_level_t level);
 KR_EXPORT
-log_level_t kr_log_level_get(void);
+kr_log_level_t kr_log_level_get(void);
 KR_EXPORT
-void kr_log_init(log_level_t level, log_target_t target);
+void kr_log_init(kr_log_level_t level, kr_log_target_t target);
 
 #define TO_STR_A(x) #x
 #define TO_STR(x) TO_STR_A(x)
@@ -196,9 +191,9 @@ void kr_log_init(log_level_t level, log_target_t target);
 /* Syslog */
 
 KR_EXPORT
-char *kr_log_level2name(log_level_t level);
+char *kr_log_level2name(kr_log_level_t level);
 KR_EXPORT
-log_level_t kr_log_name2level(const char *name);
+kr_log_level_t kr_log_name2level(const char *name);
 
 #ifndef SYSLOG_NAMES
 typedef struct _code {