From: Oto Šťáva <oto.stava@nic.cz>
Date: Mon, 8 Aug 2022 11:03:32 +0000 (+0200)
Subject: lib/log: Coverity Scan nits
X-Git-Tag: v5.5.2~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6160348d13be7b144ad530358be33b2ca8f9dc69;p=thirdparty%2Fknot-resolver.git

lib/log: Coverity Scan nits

Fixes CIDs 355763 and 355764. Also fixes a minor typo.
---

diff --git a/lib/log.c b/lib/log.c
index 92dabab98..968172a1d 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -85,6 +85,9 @@ static_assert(LOG_GRP_REQDBG <= 8 * sizeof(kr_log_groups), "Too many log groups.
 
 bool kr_log_group_is_set(enum kr_log_group group)
 {
+	if (kr_fails_assert(group >= 0))
+		return false;
+
 	return kr_log_groups & (1ULL << group);
 }
 
@@ -162,7 +165,7 @@ const char *kr_log_level2name(kr_log_level_t level)
 kr_log_level_t kr_log_name2level(const char *name)
 {
 	if (kr_fails_assert(name))
-		return LOG_GRP_UNKNOWN;
+		return LOG_UNKNOWN_LEVEL;
 
 	for (int i = 0; level_names[i].name; ++i)
 	{
@@ -170,7 +173,7 @@ kr_log_level_t kr_log_name2level(const char *name)
 			return level_names[i].level;
 	}
 
-	return LOG_GRP_UNKNOWN;
+	return LOG_UNKNOWN_LEVEL;
 }
 
 const char *kr_log_grp2name(enum kr_log_group group)
@@ -187,7 +190,7 @@ const char *kr_log_grp2name(enum kr_log_group group)
 enum kr_log_group kr_log_name2grp(const char *name)
 {
 	if (kr_fails_assert(name))
-		return -1;
+		return LOG_GRP_UNKNOWN;
 
 	for (int i = 0; log_group_names[i].g_name; ++i)
 	{
@@ -195,7 +198,7 @@ enum kr_log_group kr_log_name2grp(const char *name)
 			return log_group_names[i].g_val;
 	}
 
-	return -1;
+	return LOG_GRP_UNKNOWN;
 }
 
 
@@ -227,6 +230,9 @@ void kr_log_level_set(kr_log_level_t level)
 
 void kr_log_group_add(enum kr_log_group group)
 {
+	if (kr_fails_assert(group >= 0))
+		return;
+
 	kr_log_groups |= (1ULL << group);
 	if (group == LOG_GRP_GNUTLS)
 		kr_gnutls_log_level_set();
diff --git a/lib/log.h b/lib/log.h
index 2f8a2b0ab..272f9af0a 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -7,6 +7,7 @@
 #include <syslog.h>
 #include "lib/defines.h"
 
+#define LOG_UNKNOWN_LEVEL	-1 /**< Negative error value. */
 #define LOG_GNUTLS_LEVEL	5 /**< GnuTLS level is 5. */
 
 /* Targets */