Prep v239: Remove udev-util.c, we no longer need that.

diff --git a/src/shared/meson.build b/src/shared/meson.build
index 760f9a123dc27de75f4ecb99ab0b730987852161..b215e267d79ca8d361d322c3538876d7aad8c151 100644 (file)
--- 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 (file)
index f8e81a8..0000000
--- 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 6b0d506aba38641f43493908c58aa7d8b8ababde..15eece97fe564d14929f825f5627c0ccf5c7c8db 100644 (file)
--- 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