From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 7 Jan 2025 22:44:41 +0000 (+0100)
Subject: tree-wide: use log_level_is_valid() more
X-Git-Tag: v258-rc1~1559^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F35914%2Fhead;p=thirdparty%2Fsystemd.git

tree-wide: use log_level_is_valid() more
---

diff --git a/src/basic/log.c b/src/basic/log.c
index cbc6edc95df..2250dfe9272 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -397,7 +397,7 @@ void log_forget_fds(void) {
 }
 
 int log_set_max_level(int level) {
-        assert(level == LOG_NULL || LOG_PRI(level) == level);
+        assert(level == LOG_NULL || log_level_is_valid(level));
 
         int old = log_max_level;
         log_max_level = level;
diff --git a/src/libsystemd/sd-json/json-util.c b/src/libsystemd/sd-json/json-util.c
index b7990411ea8..f2d306f7810 100644
--- a/src/libsystemd/sd-json/json-util.c
+++ b/src/libsystemd/sd-json/json-util.c
@@ -13,6 +13,7 @@
 #include "path-util.h"
 #include "process-util.h"
 #include "string-util.h"
+#include "syslog-util.h"
 #include "user-util.h"
 
 int json_dispatch_unbase64_iovec(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
@@ -362,7 +363,7 @@ int json_dispatch_log_level(const char *name, sd_json_variant *variant, sd_json_
 
         if (FLAGS_SET(flags, SD_JSON_RELAX) && t < 0)
                 t = LOG_NULL;
-        else if (LOG_PRI(t) != t)
+        else if (!log_level_is_valid(t))
                 return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a valid log level.", strna(name));
 
         *log_level = t;
diff --git a/src/udev/udev-config.c b/src/udev/udev-config.c
index d511691ab2b..e60464360db 100644
--- a/src/udev/udev-config.c
+++ b/src/udev/udev-config.c
@@ -306,7 +306,7 @@ void manager_set_children_max(Manager *manager, unsigned n) {
 
 void manager_set_log_level(Manager *manager, int log_level) {
         assert(manager);
-        assert(LOG_PRI(log_level) == log_level);
+        assert(log_level_is_valid(log_level));
 
         int old = log_get_max_level();
 
diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index b7f2b185c99..caa43797597 100644
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -851,7 +851,7 @@ static int on_ctrl_msg(UdevCtrl *uctrl, UdevCtrlMessageType type, const UdevCtrl
 
         switch (type) {
         case UDEV_CTRL_SET_LOG_LEVEL:
-                if (LOG_PRI(value->intval) != value->intval) {
+                if (!log_level_is_valid(value->intval)) {
                         log_debug("Received invalid udev control message (SET_LOG_LEVEL, %i), ignoring.", value->intval);
                         break;
                 }