diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-01-09 15:00:30 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-01-09 15:02:55 +0900 |
commit | ff88b949531e70639c507f74da875a7de2adf543 (patch) | |
tree | 4bf1b9c8ff1db99c9d5080c52c0b4c69130c8d8f /src/libsystemd/sd-device | |
parent | 1de6a49721957a85a4934ddbdf88d535774597b1 (diff) | |
download | systemd-ff88b949531e70639c507f74da875a7de2adf543.tar.gz |
udev: move device_rename() from device-private.c
The function is used only by udevd.
Diffstat (limited to 'src/libsystemd/sd-device')
-rw-r--r-- | src/libsystemd/sd-device/device-private.c | 45 | ||||
-rw-r--r-- | src/libsystemd/sd-device/device-private.h | 1 |
2 files changed, 0 insertions, 46 deletions
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c index 7a5d128cc1..182c4d66ff 100644 --- a/src/libsystemd/sd-device/device-private.c +++ b/src/libsystemd/sd-device/device-private.c @@ -618,51 +618,6 @@ int device_get_devlink_priority(sd_device *device, int *ret) { return 0; } -int device_rename(sd_device *device, const char *name) { - _cleanup_free_ char *new_syspath = NULL; - const char *s; - int r; - - assert(device); - assert(name); - - if (!filename_is_valid(name)) - return -EINVAL; - - r = sd_device_get_syspath(device, &s); - if (r < 0) - return r; - - r = path_extract_directory(s, &new_syspath); - if (r < 0) - return r; - - if (!path_extend(&new_syspath, name)) - return -ENOMEM; - - if (!path_is_safe(new_syspath)) - return -EINVAL; - - /* At the time this is called, the renamed device may not exist yet. Hence, we cannot validate - * the new syspath. */ - r = device_set_syspath(device, new_syspath, /* verify = */ false); - if (r < 0) - return r; - - r = sd_device_get_property_value(device, "INTERFACE", &s); - if (r == -ENOENT) - return 0; - if (r < 0) - return r; - - /* like DEVPATH_OLD, INTERFACE_OLD is not saved to the db, but only stays around for the current event */ - r = device_add_property_internal(device, "INTERFACE_OLD", s); - if (r < 0) - return r; - - return device_add_property_internal(device, "INTERFACE", name); -} - static int device_shallow_clone(sd_device *device, sd_device **ret) { _cleanup_(sd_device_unrefp) sd_device *dest = NULL; const char *val = NULL; diff --git a/src/libsystemd/sd-device/device-private.h b/src/libsystemd/sd-device/device-private.h index a59f130aff..e57b74ba24 100644 --- a/src/libsystemd/sd-device/device-private.h +++ b/src/libsystemd/sd-device/device-private.h @@ -53,7 +53,6 @@ int device_properties_prepare(sd_device *device); int device_get_properties_nulstr(sd_device *device, const char **ret_nulstr, size_t *ret_len); int device_get_properties_strv(sd_device *device, char ***ret); -int device_rename(sd_device *device, const char *name); int device_clone_with_db(sd_device *device, sd_device **ret); int device_tag_index(sd_device *dev, sd_device *dev_old, bool add); |