shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

netif-util: rename net_get_name_persistent() -> net_get_persistent_name()

Browse Source
This commit is contained in:
Yu Watanabe 2021-11-08 10:55:27 +09:00
parent 4eef6fad31
commit 043b193f6e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd-network/dhcp-identifier.c
View File

@ -193,7 +193,7 @@ int dhcp_identifier_set_iaid(
/* device is under renaming */ /* device is under renaming */
return -EBUSY; return -EBUSY;
name = net_get_name_persistent(device); name = net_get_persistent_name(device);
} }
if (name) if (name)

6
src/shared/netif-util.c
View File

@ -36,7 +36,7 @@ int net_get_type_string(sd_device *device, uint16_t iftype, char **ret) {
return 0; return 0;
} }
const char *net_get_name_persistent(sd_device *device) { const char *net_get_persistent_name(sd_device *device) {
const char *name, *field; const char *name, *field;
assert(device); assert(device);
@ -59,9 +59,9 @@ int net_get_unique_predictable_data(sd_device *device, bool use_sysname, uint64_
assert(device); 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. */ * 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) if (!name && use_sysname)
(void) sd_device_get_sysname(device, &name); (void) sd_device_get_sysname(device, &name);
if (!name) if (!name)

2
src/shared/netif-util.h
View File

@ -7,5 +7,5 @@
#include "sd-device.h" #include "sd-device.h"
int net_get_type_string(sd_device *device, uint16_t iftype, char **ret); 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); int net_get_unique_predictable_data(sd_device *device, bool use_sysname, uint64_t *ret);