#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);
#include "MurmurHash2.h"
#include "device-nodes.h"
#include "libudev-private.h"
-#include "syslog-util.h"
#include "utf8.h"
/**
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;
#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"
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)
#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"
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);