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

diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c
index eb313caf81623e502d98e4c057606994173f729b..3ea6c7ce24f2cf84aac8a357b8cd12ef09a215ad 100644 (file)
--- 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 069f621103cfdd966da3f1f7838f723a4e17b4f9..b26a127c38501eb68444bbab03ccecf429958299 100644 (file)
--- 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 1d4ac5be56ce131beb7b887bfd33b24fcd97435e..d96a64b9344c0266d8dc32feb918218238bb935b 100644 (file)
--- 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);