diff --git a/repos/os/src/server/nic_router/configuration.cc b/repos/os/src/server/nic_router/configuration.cc index 0f1bced60e..9d14605360 100644 --- a/repos/os/src/server/nic_router/configuration.cc +++ b/repos/os/src/server/nic_router/configuration.cc @@ -50,7 +50,7 @@ Configuration::Configuration(Env &env, Xml_node const node, Allocator &alloc, Timer::Connection &timer, - Configuration &legacy) + Configuration &old_config) : _alloc(alloc), _verbose (node.attribute_value("verbose", false)), @@ -116,8 +116,8 @@ Configuration::Configuration(Env &env, Xml_node const report_node = node.sub_node("report"); try { /* try to re-use existing reporter */ - _reporter = legacy._reporter(); - legacy._reporter = Pointer(); + _reporter = old_config._reporter(); + old_config._reporter = Pointer(); } catch (Pointer::Invalid) { diff --git a/repos/os/src/server/nic_router/configuration.h b/repos/os/src/server/nic_router/configuration.h index deb1334947..6c487cfafe 100644 --- a/repos/os/src/server/nic_router/configuration.h +++ b/repos/os/src/server/nic_router/configuration.h @@ -69,7 +69,7 @@ class Net::Configuration Genode::Xml_node const node, Genode::Allocator &alloc, Timer::Connection &timer, - Configuration &legacy); + Configuration &old_config); ~Configuration(); diff --git a/repos/os/src/server/nic_router/main.cc b/repos/os/src/server/nic_router/main.cc index fa7774242b..9980d7d906 100644 --- a/repos/os/src/server/nic_router/main.cc +++ b/repos/os/src/server/nic_router/main.cc @@ -75,13 +75,13 @@ class Net::Main Configuration &Net::Main::_init_config() { - Configuration &config_legacy = *new (_heap) + Configuration &dummy_config = *new (_heap) Configuration(_config_rom.xml(), _heap); Configuration &config = *new (_heap) - Configuration(_env, _config_rom.xml(), _heap, _timer, config_legacy); + Configuration(_env, _config_rom.xml(), _heap, _timer, dummy_config); - destroy(_heap, &config_legacy); + destroy(_heap, &dummy_config); return config; }