summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2018-08-23 18:19:38 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commit2b7824fa8d58b9b11b96aa2ce656cef918c0919a (patch)
treeb530ac116e349d02dd6135460043cf5278cff308
parentcfec7f43419d8e827c59698adf5ea78b8766ae71 (diff)
Prep v239: Remove udev-util.c, we no longer need that.
-rw-r--r--src/shared/meson.build1
-rw-r--r--src/shared/udev-util.c65
-rw-r--r--src/shared/udev-util.h2
3 files changed, 1 insertions, 67 deletions
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 760f9a123..b215e267d 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -122,7 +122,6 @@ shared_sources = '''
sleep-config.h
spawn-polkit-agent.c
spawn-polkit-agent.h
- udev-util.c
udev-util.h
'''.split()
#endif // 0
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
deleted file mode 100644
index f8e81a87c..000000000
--- a/src/shared/udev-util.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-
-#include <string.h>
-
-#include "fileio.h"
-#include "log.h"
-#include "string-util.h"
-#include "udev-util.h"
-
-/// Additional includes needed by elogind
-#include "alloc-util.h"
-
-int udev_parse_config(void) {
- _cleanup_free_ char *val = NULL;
- const char *log;
- size_t n;
- int r;
-
- r = parse_env_file(NULL, "/etc/udev/udev.conf", NEWLINE, "udev_log", &val, NULL);
- if (r == -ENOENT || !val)
- return 0;
- if (r < 0)
- return r;
-
- /* unquote */
- n = strlen(val);
- if (n >= 2 &&
- ((val[0] == '"' && val[n-1] == '"') ||
- (val[0] == '\'' && val[n-1] == '\''))) {
- val[n - 1] = '\0';
- log = val + 1;
- } else
- log = val;
-
- /* we set the udev log level here explicitly, this is supposed
- * to regulate the code in libudev/ and udev/. */
- r = log_set_max_level_from_string_realm(LOG_REALM_UDEV, log);
- if (r < 0)
- log_debug_errno(r, "/etc/udev/udev.conf: failed to set udev log level '%s', ignoring: %m", log);
-
- return 0;
-}
-
-int udev_device_new_from_stat_rdev(struct udev *udev, const struct stat *st, struct udev_device **ret) {
- struct udev_device *nd;
- char type;
-
- assert(udev);
- assert(st);
- assert(ret);
-
- if (S_ISBLK(st->st_mode))
- type = 'b';
- else if (S_ISCHR(st->st_mode))
- type = 'c';
- else
- return -ENOTTY;
-
- nd = udev_device_new_from_devnum(udev, type, st->st_rdev);
- if (!nd)
- return -errno;
-
- *ret = nd;
- return 0;
-}
diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h
index 6b0d506ab..15eece97f 100644
--- a/src/shared/udev-util.h
+++ b/src/shared/udev-util.h
@@ -22,7 +22,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_msg*, udev_ctrl_msg_unref);
DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_monitor*, udev_monitor_unref);
#if 0 /// UNNEEDED by elogind
-#endif // 0
int udev_parse_config(void);
int udev_device_new_from_stat_rdev(struct udev *udev, const struct stat *st, struct udev_device **ret);
+#endif // 0