From 30429a5228a3f38688a2c3d08191dc0fd108bae2 Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Mon, 11 Jan 2021 00:23:14 +0100 Subject: [PATCH] nic_flood: Drop Dhcp_client::_alloc member. This private member variable is not used anywhere in the code. This breaks builds using clang instead of GCC. Drop it. Issue #3984 --- repos/os/src/test/net_flood/dhcp_client.cc | 4 +--- repos/os/src/test/net_flood/dhcp_client.h | 4 +--- repos/os/src/test/net_flood/main.cc | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/repos/os/src/test/net_flood/dhcp_client.cc b/repos/os/src/test/net_flood/dhcp_client.cc index b9daa5cf9f..b32d603689 100644 --- a/repos/os/src/test/net_flood/dhcp_client.cc +++ b/repos/os/src/test/net_flood/dhcp_client.cc @@ -51,12 +51,10 @@ void append_param_req_list(Dhcp_options &dhcp_opts) ** Dhcp_client ** *****************/ -Dhcp_client::Dhcp_client(Genode::Allocator &alloc, - Timer::Connection &timer, +Dhcp_client::Dhcp_client(Timer::Connection &timer, Nic &nic, Dhcp_client_handler &handler) : - _alloc (alloc), _timeout (timer, *this, &Dhcp_client::_handle_timeout), _nic (nic), _handler (handler) diff --git a/repos/os/src/test/net_flood/dhcp_client.h b/repos/os/src/test/net_flood/dhcp_client.h index e1bbd2ee9c..4df8f6cedb 100644 --- a/repos/os/src/test/net_flood/dhcp_client.h +++ b/repos/os/src/test/net_flood/dhcp_client.h @@ -64,7 +64,6 @@ class Net::Dhcp_client enum { DISCOVER_TIMEOUT_SEC = 2 }; enum { REQUEST_TIMEOUT_SEC = 2 }; - Genode::Allocator &_alloc; State _state { State::INIT }; Timer::One_shot_timeout _timeout; unsigned long _lease_time_sec = 0; @@ -92,8 +91,7 @@ class Net::Dhcp_client public: - Dhcp_client(Genode::Allocator &alloc, - Timer::Connection &timer, + Dhcp_client(Timer::Connection &timer, Nic &nic, Dhcp_client_handler &handler); diff --git a/repos/os/src/test/net_flood/main.cc b/repos/os/src/test/net_flood/main.cc index 6f14012e53..115f29a3c3 100644 --- a/repos/os/src/test/net_flood/main.cc +++ b/repos/os/src/test/net_flood/main.cc @@ -125,7 +125,7 @@ Main::Main(Env &env) : _env(env) /* else, start the DHCP client for requesting an IP config */ else { - _dhcp_client.construct(_heap, _timer, _nic, *this); } + _dhcp_client.construct(_timer, _nic, *this); } }