summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-08-13 22:37:45 +0200
committerTom Gundersen <teg@jklm.no>2014-08-13 22:37:45 +0200
commitd6731e4c7964ee2860d4f5abdb0b52acd7a66960 (patch)
tree4907195ea25faf6d3db37aa1f6d2fed4ad5f1ca6 /src/network
parent5323ead145304785121b72dcbc1c244303de7575 (diff)
sd-network: /_get_link_/_link_get_/
The link is the 'object', so make this in line with our usual naming convention. Suggested by Kay and Lennart.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkctl.c12
-rw-r--r--src/network/networkd-wait-online-link.c4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 9c4c1b7e77..6fb9e62775 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -198,8 +198,8 @@ static int list_links(char **args, unsigned n) {
char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL;
- sd_network_get_link_state(links[i].ifindex, &state);
- sd_network_get_link_operational_state(links[i].ifindex, &operational_state);
+ sd_network_link_get_state(links[i].ifindex, &state);
+ sd_network_link_get_operational_state(links[i].ifindex, &operational_state);
sprintf(devid, "n%i", links[i].ifindex);
d = udev_device_new_from_device_id(udev, devid);
@@ -340,11 +340,11 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu);
- sd_network_get_link_state(ifindex, &state);
- sd_network_get_link_operational_state(ifindex, &operational_state);
+ sd_network_link_get_state(ifindex, &state);
+ sd_network_link_get_operational_state(ifindex, &operational_state);
- sd_network_get_link_dns(ifindex, &dns);
- sd_network_get_link_ntp(ifindex, &ntp);
+ sd_network_link_get_dns(ifindex, &dns);
+ sd_network_link_get_ntp(ifindex, &ntp);
sprintf(devid, "n%i", ifindex);
d = udev_device_new_from_device_id(udev, devid);
diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c
index 47fb0c05df..1670beefab 100644
--- a/src/network/networkd-wait-online-link.c
+++ b/src/network/networkd-wait-online-link.c
@@ -126,12 +126,12 @@ int link_update_monitor(Link *l) {
free(l->operational_state);
l->operational_state = NULL;
- sd_network_get_link_operational_state(l->ifindex, &l->operational_state);
+ sd_network_link_get_operational_state(l->ifindex, &l->operational_state);
free(l->state);
l->state = NULL;
- sd_network_get_link_state(l->ifindex, &l->state);
+ sd_network_link_get_state(l->ifindex, &l->state);
return 0;
}