summaryrefslogtreecommitdiff
path: root/src/network/networkd-manager.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-06-25 15:58:30 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-07-01 00:49:02 +0900
commit6eab614db805504cec3af0c1c7b21ae6275a89a6 (patch)
tree62e12230d07983edc51beffc0ff95d47891a8076 /src/network/networkd-manager.c
parent907d5ce4d4f74abb121eb8979ee4fd0a6d8f501a (diff)
downloadsystemd-6eab614db805504cec3af0c1c7b21ae6275a89a6.tar.gz
network: rename Manager::links -> Manager::links_by_index
This also renames link_get() -> link_get_by_index().
Diffstat (limited to 'src/network/networkd-manager.c')
-rw-r--r--src/network/networkd-manager.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 5b6eefb743..b95742f490 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -58,7 +58,7 @@ static int manager_reset_all(Manager *m) {
assert(m);
- HASHMAP_FOREACH(link, m->links) {
+ HASHMAP_FOREACH(link, m->links_by_index) {
r = link_carrier_reset(link);
if (r < 0) {
log_link_warning_errno(link, r, "Could not reset carrier: %m");
@@ -451,7 +451,7 @@ Manager* manager_free(Manager *m) {
free(m->state_file);
- HASHMAP_FOREACH(link, m->links)
+ HASHMAP_FOREACH(link, m->links_by_index)
(void) link_stop_engines(link, true);
m->request_queue = ordered_set_free(m->request_queue);
@@ -462,7 +462,7 @@ Manager* manager_free(Manager *m) {
m->dirty_links = set_free_with_destructor(m->dirty_links, link_unref);
m->links_requesting_uuid = set_free_with_destructor(m->links_requesting_uuid, link_unref);
m->links_by_name = hashmap_free(m->links_by_name);
- m->links = hashmap_free_with_destructor(m->links, link_unref);
+ m->links_by_index = hashmap_free_with_destructor(m->links_by_index, link_unref);
m->networks = ordered_hashmap_free_with_destructor(m->networks, network_unref);
@@ -528,7 +528,7 @@ int manager_start(Manager *m) {
if (r < 0)
log_warning_errno(r, "Failed to update state file %s, ignoring: %m", m->state_file);
- HASHMAP_FOREACH(link, m->links) {
+ HASHMAP_FOREACH(link, m->links_by_index) {
r = link_save(link);
if (r < 0)
log_link_warning_errno(link, r, "Failed to update link state file %s, ignoring: %m", link->state_file);