SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-device: rename devpath_from_devnum() -> devname_from_devnum()

Browse Source 
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.
This commit is contained in:
Yu Watanabe
2022-09-03 00:42:31 +09:00
parent 81e327c42c
commit 4fe46c349d
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/device-util.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "fd-util.h"
#include "string-util.h"
int devpath_from_devnum(mode_t mode, dev_t devnum, char **ret) {
int devname_from_devnum(mode_t mode, dev_t devnum, char **ret) {
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
_cleanup_free_ char *s = NULL;
const char *devname;
src/libsystemd/sd-device/device-util.h
+1 -1
View File
@@ -81,5 +81,5 @@
#define log_device_warning_errno(device, error, ...) log_device_full_errno(device, LOG_WARNING, error, __VA_ARGS__)
#define log_device_error_errno(device, error, ...) log_device_full_errno(device, LOG_ERR, error, __VA_ARGS__)
int devpath_from_devnum(mode_t mode, dev_t devnum, char **ret);
int devname_from_devnum(mode_t mode, dev_t devnum, char **ret);
int device_open_from_devnum(mode_t mode, dev_t devnum, int flags, char **ret);
src/libsystemd/sd-device/test-sd-device.c
+11 -11
View File
@@ -500,7 +500,7 @@ TEST(sd_device_new_from_path) {
}
}
static void test_devpath_from_devnum_one(const char *path) {
static void test_devname_from_devnum_one(const char *path) {
_cleanup_free_ char *resolved = NULL;
struct stat st;
@@ -512,21 +512,21 @@ static void test_devpath_from_devnum_one(const char *path) {
return;
}
assert_se(devpath_from_devnum(st.st_mode, st.st_rdev, &resolved) >= 0);
assert_se(devname_from_devnum(st.st_mode, st.st_rdev, &resolved) >= 0);
assert_se(path_equal(path, resolved));
}
TEST(devpath_from_devnum) {
test_devpath_from_devnum_one("/dev/null");
test_devpath_from_devnum_one("/dev/zero");
test_devpath_from_devnum_one("/dev/full");
test_devpath_from_devnum_one("/dev/random");
test_devpath_from_devnum_one("/dev/urandom");
test_devpath_from_devnum_one("/dev/tty");
TEST(devname_from_devnum) {
test_devname_from_devnum_one("/dev/null");
test_devname_from_devnum_one("/dev/zero");
test_devname_from_devnum_one("/dev/full");
test_devname_from_devnum_one("/dev/random");
test_devname_from_devnum_one("/dev/urandom");
test_devname_from_devnum_one("/dev/tty");
if (is_device_node("/run/systemd/inaccessible/blk") > 0) {
test_devpath_from_devnum_one("/run/systemd/inaccessible/chr");
test_devpath_from_devnum_one("/run/systemd/inaccessible/blk");
test_devname_from_devnum_one("/run/systemd/inaccessible/chr");
test_devname_from_devnum_one("/run/systemd/inaccessible/blk");
}
}