shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

sd-networkd: rename link_get_state to link_get_setup_state

Browse Source 
Suggested by Kay and Lennart.
This commit is contained in:
Tom Gundersen 2014-08-13 22:55:49 +02:00
parent d3df0e3982
commit 438ca2bbd4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/sd-network/sd-network.c
View File

@ -92,7 +92,7 @@ _public_ int sd_network_get_ntp(char ***ret) {
return network_get_strv("NTP", ret); return network_get_strv("NTP", ret);
} }
_public_ int sd_network_link_get_state(int ifindex, char **state) { _public_ int sd_network_link_get_setup_state(int ifindex, char **state) {
_cleanup_free_ char *s = NULL, *p = NULL; _cleanup_free_ char *s = NULL, *p = NULL;
int r; int r;

4
src/network/networkctl.c
View File

@ -198,7 +198,7 @@ static int list_links(char **args, unsigned n) {
char devid[2 + DECIMAL_STR_MAX(int)]; char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL; _cleanup_free_ char *t = NULL;
sd_network_link_get_state(links[i].ifindex, &state); sd_network_link_get_setup_state(links[i].ifindex, &state);
sd_network_link_get_operational_state(links[i].ifindex, &operational_state); sd_network_link_get_operational_state(links[i].ifindex, &operational_state);
sprintf(devid, "n%i", links[i].ifindex); sprintf(devid, "n%i", links[i].ifindex);
@ -340,7 +340,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu); sd_rtnl_message_read_u32(reply, IFLA_MTU, &mtu);
sd_network_link_get_state(ifindex, &state); sd_network_link_get_setup_state(ifindex, &state);
sd_network_link_get_operational_state(ifindex, &operational_state); sd_network_link_get_operational_state(ifindex, &operational_state);
sd_network_link_get_dns(ifindex, &dns); sd_network_link_get_dns(ifindex, &dns);

2
src/network/networkd-wait-online-link.c
View File

@ -131,7 +131,7 @@ int link_update_monitor(Link *l) {
free(l->state); free(l->state);
l->state = NULL; l->state = NULL;
sd_network_link_get_state(l->ifindex, &l->state); sd_network_link_get_setup_state(l->ifindex, &l->state);
return 0; return 0;
} }

4
src/systemd/sd-network.h
View File

@ -64,7 +64,7 @@ int sd_network_get_dns(char ***addr);
* reperesentations of IP addresses */ * reperesentations of IP addresses */
int sd_network_get_ntp(char ***addr); int sd_network_get_ntp(char ***addr);
/* Get state from ifindex. /* Get setup state from ifindex.
* Possible states: * Possible states:
* pending: udev is still processing the link, we don't yet know if we will manage it * pending: udev is still processing the link, we don't yet know if we will manage it
* failed: networkd failed to manage the link * failed: networkd failed to manage the link
@ -75,7 +75,7 @@ int sd_network_get_ntp(char ***addr);
* Possible return codes: * Possible return codes:
* -ENODATA: networkd is not aware of the link * -ENODATA: networkd is not aware of the link
*/ */
int sd_network_link_get_state(int ifindex, char **state); int sd_network_link_get_setup_state(int ifindex, char **state);
/* Get operatinal state from ifindex. /* Get operatinal state from ifindex.
* Possible states: * Possible states: