sd-network: rename the per-ifindex calls to sd_network_get_link_xxx()

This way we can introduce system-wide versions of these calls that are
called the same way, but without the "link" in the name.

2 files changed, 8 insertions, 8 deletions

diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c
index 56eeb99e4b..5d5913186d 100644
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/networkd-netdev-tunnel.c
@@ -114,7 +114,7 @@ static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
         r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_TTL, t->ttl);
         if (r < 0) {
                 log_error_netdev(netdev,
-                                 "Could not append IFLA_IPTUN_TTL  attribute: %s",
+                                 "Could not append IFLA_IPTUN_TTL attribute: %s",
                                  strerror(-r));
                 return r;
         }
diff --git a/src/network/sd-network.c b/src/network/sd-network.c
index ed02eccaf1..cc4b160e74 100644
--- a/src/network/sd-network.c
+++ b/src/network/sd-network.c
@@ -107,7 +107,7 @@ _public_ int sd_network_get_link_operational_state(int ifindex, char **state) {
         return 0;
 }
 
-_public_ int sd_network_get_llmnr(int ifindex, char **llmnr) {
+_public_ int sd_network_get_link_llmnr(int ifindex, char **llmnr) {
         _cleanup_free_ char *s = NULL, *p = NULL;
         int r;
 
@@ -131,7 +131,7 @@ _public_ int sd_network_get_llmnr(int ifindex, char **llmnr) {
         return 0;
 }
 
-_public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) {
+_public_ int sd_network_get_link_dhcp_lease(int ifindex, sd_dhcp_lease **ret) {
         _cleanup_free_ char *p = NULL, *s = NULL;
         sd_dhcp_lease *lease = NULL;
         int r;
@@ -158,7 +158,7 @@ _public_ int sd_network_get_dhcp_lease(int ifindex, sd_dhcp_lease **ret) {
         return 0;
 }
 
-static int network_get_strv(const char *key, int ifindex, char ***ret) {
+static int network_get_link_strv(const char *key, int ifindex, char ***ret) {
         _cleanup_free_ char *p = NULL, *s = NULL;
         _cleanup_strv_free_ char **a = NULL;
         int r;
@@ -191,12 +191,12 @@ static int network_get_strv(const char *key, int ifindex, char ***ret) {
         return r;
 }
 
-_public_ int sd_network_get_dns(int ifindex, char ***ret) {
-        return network_get_strv("DNS", ifindex, ret);
+_public_ int sd_network_get_link_dns(int ifindex, char ***ret) {
+        return network_get_link_strv("DNS", ifindex, ret);
 }
 
-_public_ int sd_network_get_ntp(int ifindex, char ***ret) {
-        return network_get_strv("NTP", ifindex, ret);
+_public_ int sd_network_get_link_ntp(int ifindex, char ***ret) {
+        return network_get_link_strv("NTP", ifindex, ret);
 }
 
 static inline int MONITOR_TO_FD(sd_network_monitor *m) {