From 3a616fed4da5fb721f671e9a9f3af0c8659b6fb9 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Mon, 19 Sep 2022 09:44:55 +0200 Subject: [PATCH] nic_router: rename is_ready() to ready() Ref #4612 --- repos/os/src/server/nic_router/domain.cc | 6 +++--- repos/os/src/server/nic_router/domain.h | 2 +- repos/os/src/server/nic_router/interface.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/repos/os/src/server/nic_router/domain.cc b/repos/os/src/server/nic_router/domain.cc index bfbaf51f63..868bebc92e 100644 --- a/repos/os/src/server/nic_router/domain.cc +++ b/repos/os/src/server/nic_router/domain.cc @@ -49,7 +49,7 @@ void Domain::_log_ip_config() const } -bool Domain::is_ready() const +bool Domain::ready() const { if (_dhcp_server.valid()) { if (_dhcp_server().has_invalid_remote_dns_cfg()) { @@ -62,9 +62,9 @@ bool Domain::is_ready() const void Domain::update_ready_state() { - bool const ready { is_ready() }; + bool const rdy { ready() }; _interfaces.for_each([&] (Interface &interface) { - interface.handle_domain_ready_state(ready); + interface.handle_domain_ready_state(rdy); }); } diff --git a/repos/os/src/server/nic_router/domain.h b/repos/os/src/server/nic_router/domain.h index 314b30299f..ac521eeca7 100644 --- a/repos/os/src/server/nic_router/domain.h +++ b/repos/os/src/server/nic_router/domain.h @@ -223,7 +223,7 @@ class Net::Domain : public Domain_base, void add_dropped_fragm_ipv4(unsigned long dropped_fragm_ipv4); - bool is_ready() const; + bool ready() const; void update_ready_state(); diff --git a/repos/os/src/server/nic_router/interface.cc b/repos/os/src/server/nic_router/interface.cc index 072e294ea0..f22a4c1df3 100644 --- a/repos/os/src/server/nic_router/interface.cc +++ b/repos/os/src/server/nic_router/interface.cc @@ -461,7 +461,7 @@ void Interface::handle_domain_ready_state(bool state) void Interface::_refetch_domain_ready_state() { if (_domain.valid()) { - handle_domain_ready_state(_domain().is_ready()); + handle_domain_ready_state(_domain().ready()); } else { handle_domain_ready_state(false); }