From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 29 Oct 2018 07:50:39 +0000 (+0900)
Subject: udev: drop util_log_priority() and use log_level_from_string()
X-Git-Tag: v240~346^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46f0fbd8fd8ed1428b6f038b88375935e722eeaa;p=thirdparty%2Fsystemd.git

udev: drop util_log_priority() and use log_level_from_string()

The function util_log_priority() is almost same as
log_level_from_string(). The difference between them is only that
util_log_priority() accepts such that '3 hogehoge'.
---

diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
index bf06e3add69..fdf87acf9e4 100644
--- a/src/libudev/libudev-private.h
+++ b/src/libudev/libudev-private.h
@@ -99,7 +99,6 @@ void udev_list_entry_set_num(struct udev_list_entry *list_entry, int num);
 #define UTIL_NAME_SIZE                       512
 #define UTIL_LINE_SIZE                     16384
 #define UDEV_ALLOWED_CHARS_INPUT        "/ $%?,"
-int util_log_priority(const char *priority);
 size_t util_path_encode(const char *src, char *dest, size_t size);
 int util_replace_whitespace(const char *str, char *to, size_t len);
 int util_replace_chars(char *str, const char *white);
diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 3bb27fbc4e3..df5223e5a96 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -12,7 +12,6 @@
 #include "MurmurHash2.h"
 #include "device-nodes.h"
 #include "libudev-private.h"
-#include "syslog-util.h"
 #include "utf8.h"
 
 /**
@@ -84,21 +83,6 @@ int util_resolve_subsys_kernel(const char *string,
         return 0;
 }
 
-int util_log_priority(const char *priority) {
-        char *endptr;
-        int prio;
-
-        prio = strtoul(priority, &endptr, 10);
-        if (endptr[0] == '\0' || isspace(endptr[0])) {
-                if (prio >= 0 && prio <= 7)
-                        return prio;
-                else
-                        return -ERANGE;
-        }
-
-        return log_level_from_string(priority);
-}
-
 size_t util_path_encode(const char *src, char *dest, size_t size) {
         size_t i, j;
 
diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 22ac4962edd..d9320418cf8 100644
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -19,9 +19,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libudev-private.h"
 #include "parse-util.h"
 #include "process-util.h"
+#include "syslog-util.h"
 #include "time-util.h"
 #include "udevadm.h"
 #include "udev-ctrl.h"
@@ -84,18 +84,15 @@ int control_main(int argc, char *argv[], void *userdata) {
                         if (r < 0)
                                 return r;
                         break;
-                case 'l': {
-                        int i;
-
-                        i = util_log_priority(optarg);
-                        if (i < 0)
-                                return log_error_errno(i, "invalid number '%s'", optarg);
+                case 'l':
+                        r = log_level_from_string(optarg);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to parse log priority '%s': %m", optarg);
 
-                        r = udev_ctrl_send_set_log_level(uctrl, i, timeout);
+                        r = udev_ctrl_send_set_log_level(uctrl, r, timeout);
                         if (r < 0)
                                 return r;
                         break;
-                }
                 case 's':
                         r = udev_ctrl_send_stop_exec_queue(uctrl, timeout);
                         if (r < 0)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 12b3298a06b..1a643d53090 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -51,6 +51,7 @@
 #include "signal-util.h"
 #include "socket-util.h"
 #include "string-util.h"
+#include "syslog-util.h"
 #include "terminal-util.h"
 #include "udev-builtin.h"
 #include "udev-ctrl.h"
@@ -1452,7 +1453,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                r = util_log_priority(value);
+                r = log_level_from_string(value);
                 if (r >= 0)
                         log_set_max_level(r);