ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-31 22:50:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nic_router: get rid of the term "legacy"

Browse Source 
The term was used for the old configuration during the handling of a new
configuration but in other places it was already called old_config.

Issue #2840
This commit is contained in:
Martin Stein 2018-06-05 12:51:57 +02:00 committed by Norman Feske
parent ff7bc0ac6c
commit d4f08b5a71
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/os/src/server/nic_router/configuration.cc
View File

@ -50,7 +50,7 @@ Configuration::Configuration(Env &env,
Xml_node const node, Xml_node const node,
Allocator &alloc, Allocator &alloc,
Timer::Connection &timer, Timer::Connection &timer,
Configuration &legacy) Configuration &old_config)
: :
_alloc(alloc), _alloc(alloc),
_verbose (node.attribute_value("verbose", false)), _verbose (node.attribute_value("verbose", false)),
@ -116,8 +116,8 @@ Configuration::Configuration(Env &env,
Xml_node const report_node = node.sub_node("report"); Xml_node const report_node = node.sub_node("report");
try { try {
/* try to re-use existing reporter */ /* try to re-use existing reporter */
_reporter = legacy._reporter(); _reporter = old_config._reporter();
legacy._reporter = Pointer<Reporter>(); old_config._reporter = Pointer<Reporter>();
} }
catch (Pointer<Reporter>::Invalid) { catch (Pointer<Reporter>::Invalid) {

2
repos/os/src/server/nic_router/configuration.h
View File

@ -69,7 +69,7 @@ class Net::Configuration
Genode::Xml_node const node, Genode::Xml_node const node,
Genode::Allocator &alloc, Genode::Allocator &alloc,
Timer::Connection &timer, Timer::Connection &timer,
Configuration &legacy); Configuration &old_config);
~Configuration(); ~Configuration();

6
repos/os/src/server/nic_router/main.cc
View File

@ -75,13 +75,13 @@ class Net::Main
Configuration &Net::Main::_init_config() Configuration &Net::Main::_init_config()
{ {
Configuration &config_legacy = *new (_heap) Configuration &dummy_config = *new (_heap)
Configuration(_config_rom.xml(), _heap); Configuration(_config_rom.xml(), _heap);
Configuration &config = *new (_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; return config;
} }