From 043b193f6e09058a0aa65c404eb528d70e2fb314 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 8 Nov 2021 10:55:27 +0900 Subject: [PATCH] netif-util: rename net_get_name_persistent() -> net_get_persistent_name() --- src/libsystemd-network/dhcp-identifier.c | 2 +- src/shared/netif-util.c | 6 +++--- src/shared/netif-util.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index eb313caf81..3ea6c7ce24 100644 --- a/src/libsystemd-network/dhcp-identifier.c +++ b/src/libsystemd-network/dhcp-identifier.c @@ -193,7 +193,7 @@ int dhcp_identifier_set_iaid( /* device is under renaming */ return -EBUSY; - name = net_get_name_persistent(device); + name = net_get_persistent_name(device); } if (name) diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c index 069f621103..b26a127c38 100644 --- a/src/shared/netif-util.c +++ b/src/shared/netif-util.c @@ -36,7 +36,7 @@ int net_get_type_string(sd_device *device, uint16_t iftype, char **ret) { return 0; } -const char *net_get_name_persistent(sd_device *device) { +const char *net_get_persistent_name(sd_device *device) { const char *name, *field; assert(device); @@ -59,9 +59,9 @@ int net_get_unique_predictable_data(sd_device *device, bool use_sysname, uint64_ assert(device); - /* net_get_name_persistent() will return one of the device names based on stable information about + /* net_get_persistent_name() will return one of the device names based on stable information about * the device. If this is not available, we fall back to using the actual device name. */ - name = net_get_name_persistent(device); + name = net_get_persistent_name(device); if (!name && use_sysname) (void) sd_device_get_sysname(device, &name); if (!name) diff --git a/src/shared/netif-util.h b/src/shared/netif-util.h index 1d4ac5be56..d96a64b934 100644 --- a/src/shared/netif-util.h +++ b/src/shared/netif-util.h @@ -7,5 +7,5 @@ #include "sd-device.h" int net_get_type_string(sd_device *device, uint16_t iftype, char **ret); -const char *net_get_name_persistent(sd_device *device); +const char *net_get_persistent_name(sd_device *device); int net_get_unique_predictable_data(sd_device *device, bool use_sysname, uint64_t *ret);