From 4fe46c349d98aee5d880f65ebbf4e9e879138346 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 3 Sep 2022 00:28:03 +0900 Subject: sd-device: rename devpath_from_devnum() -> devname_from_devnum() In sd-device, `devpath` is a kind of syspath without '/sys' prefix, e.g. /devices/pci0000:00/0000:00:1c.4/0000:3c:00.0/nvme/nvme0/nvme0n1, and `devname` is a path to the device node, e.g. /dev/nvme0n1. Let's use the consistent name for the helper function. --- src/shared/find-esp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/shared/find-esp.c') diff --git a/src/shared/find-esp.c b/src/shared/find-esp.c index d21b6742b9..61831c2dc8 100644 --- a/src/shared/find-esp.c +++ b/src/shared/find-esp.c @@ -45,7 +45,7 @@ static int verify_esp_blkid( const char *v; int r; - r = devpath_from_devnum(S_IFBLK, devid, &node); + r = devname_from_devnum(S_IFBLK, devid, &node); if (r < 0) return log_error_errno(r, "Failed to get device path for " DEVNUM_FORMAT_STR ": %m", DEVNUM_FORMAT_VAL(devid)); @@ -508,7 +508,7 @@ static int verify_xbootldr_blkid( const char *type, *v; int r; - r = devpath_from_devnum(S_IFBLK, devid, &node); + r = devname_from_devnum(S_IFBLK, devid, &node); if (r < 0) return log_error_errno(r, "Failed to get block device path for " DEVNUM_FORMAT_STR ": %m", DEVNUM_FORMAT_VAL(devid)); -- cgit v1.2.1