util: drop DEV_NUM_PATH_MAX and xsprintf_dev_num_path()

diff --git a/src/shared/device-nodes.h b/src/shared/device-nodes.h
index 9e5c79f67d28fe09fa69b1d116a0ff70a2e63a8b..a8b256431495702f59923a89d500957d988d241e 100644 (file)
--- a/src/shared/device-nodes.h
+++ b/src/shared/device-nodes.h
@@ -2,15 +2,6 @@
 #pragma once
 
 #include <stddef.h>
-#include <sys/types.h>
-
-#include "macro.h"
-#include "stdio-util.h"
 
 int encode_devnode_name(const char *str, char *str_enc, size_t len);
 int allow_listed_char_for_devnode(char c, const char *additional);
-
-#define DEV_NUM_PATH_MAX                                                \
-        (STRLEN("/dev/block/") + DECIMAL_STR_MAX(dev_t) + 1 + DECIMAL_STR_MAX(dev_t))
-#define xsprintf_dev_num_path(buf, type, devno)                         \
-        xsprintf(buf, "/dev/%s/%u:%u", type, major(devno), minor(devno))

diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
index c914d78324f9b8b6b5288c8298082db0ccb14e89..7ba05b53e97c1e7afd101abe4cade8d28e3bc007 100644 (file)
--- a/src/test/test-device-nodes.c
+++ b/src/test/test-device-nodes.c
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdio.h>
 #include <sys/types.h>
 
 #include "alloc-util.h"
 #include "device-nodes.h"
 #include "string-util.h"
-#include "util.h"
 
 /* helpers for test_encode_devnode_name */
 static char *do_encode_string(const char *in) {

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index d90c933988c37d235d4f195eb54e3e1ea3f81c90..a56084de7eb9377ff3f7aee676d4f6f5ac27a5c5 100644 (file)
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -10,7 +10,6 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
-#include "device-nodes.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "dirent-util.h"
@@ -517,7 +516,6 @@ static int node_permissions_apply(sd_device *dev, bool apply_mac,
 }
 
 static int xsprintf_dev_num_path_from_sd_device(sd_device *dev, char **ret) {
-        char filename[DEV_NUM_PATH_MAX], *s;
         const char *subsystem;
         dev_t devnum;
         int r;
@@ -532,16 +530,7 @@ static int xsprintf_dev_num_path_from_sd_device(sd_device *dev, char **ret) {
         if (r < 0)
                 return r;
 
-        xsprintf_dev_num_path(filename,
-                              streq(subsystem, "block") ? "block" : "char",
-                              devnum);
-
-        s = strdup(filename);
-        if (!s)
-                return -ENOMEM;
-
-        *ret = s;
-        return 0;
+        return device_path_make_major_minor(streq(subsystem, "block") ? S_IFBLK : S_IFCHR, devnum, ret);
 }
 
 int udev_node_add(sd_device *dev, bool apply,