Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Another bunch of removed unused fields #114

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+3 −15
Open

Another bunch of removed unused fields #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3127d20
remove unused field
hsn10 Dec 23, 2013
bce66d8
remove unused field _eventloop
hsn10 Dec 23, 2013
370ac10
remove unused _xrl_router and _eventloop from vifmanager
hsn10 Dec 23, 2013
ea271c7
_af field removed, remove it from constructor as well
hsn10 Dec 24, 2013
99df92d
remove unused field _fea_node from FibConfig
hsn10 Dec 24, 2013
a54a06c
remove unused field _execute_done from rtmgr/module_command
hsn10 Dec 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions xorp/fea/data_plane/fibconfig/fibconfig_table_observer_rtmv2.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,12 @@ private:
public:
RtmV2Observer(WinRtmPipe& rs, int af,
FibConfigTableObserverRtmV2& rtmo)
: WinRtmPipeObserver(rs), _af(af), _rtmo(rtmo) {}
: WinRtmPipeObserver(rs), _rtmo(rtmo) {}
virtual ~RtmV2Observer() {}
void routing_socket_data(vector<uint8_t>& buffer) {
_rtmo.receive_data(buffer);
}
private:
int _af;
FibConfigTableObserverRtmV2& _rtmo;
};

Expand Down
3 changes: 1 addition & 2 deletions xorp/fea/fibconfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@

FibConfig::FibConfig(FeaNode& fea_node, const IfTree& system_config_iftree,
const IfTree& merged_config_iftree)
: _fea_node(fea_node),
_eventloop(fea_node.eventloop()),
: _eventloop(fea_node.eventloop()),
#ifndef XORP_DISABLE_PROFILE
_profile(fea_node.profile()),
#endif
Expand Down
1 change: 0 additions & 1 deletion xorp/fea/fibconfig.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,6 @@ protected:
Trie6 _trie6; // IPv6 trie (used for testing purpose)

private:
FeaNode& _fea_node;
EventLoop& _eventloop;
#ifndef XORP_DISABLE_PROFILE
Profile& _profile;
Expand Down
1 change: 0 additions & 1 deletion xorp/fea/tools/show_interfaces.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ InterfaceMonitor::InterfaceMonitor(EventLoop& eventloop,
uint16_t finder_port,
const string& fea_target)
: ServiceBase(class_name),
_eventloop(eventloop),
_ifmgr(eventloop, fea_target.c_str(), finder_hostname.c_str(),
finder_port),
_startup_requests_n(0),
Expand Down
2 changes: 0 additions & 2 deletions xorp/fea/tools/show_interfaces.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ private:
*/
int ifmgr_shutdown();

EventLoop& _eventloop;

IfMgrXrlMirror _ifmgr;

//
Expand Down
4 changes: 1 addition & 3 deletions xorp/rib/vifmanager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ VifManager::VifManager(XrlRouter& xrl_router,
EventLoop& eventloop,
RibManager* rib_manager,
const string& fea_target)
: _xrl_router(xrl_router),
_eventloop(eventloop),
_rib_manager(rib_manager),
: _rib_manager(rib_manager),
_ifmgr(eventloop, fea_target.c_str(), xrl_router.finder_address(),
xrl_router.finder_port()),
_startup_requests_n(0),
Expand Down
2 changes: 0 additions & 2 deletions xorp/rib/vifmanager.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ private:
*/
int ifmgr_shutdown();

XrlRouter& _xrl_router;
EventLoop& _eventloop;
RibManager* _rib_manager;

IfMgrXrlMirror _ifmgr;
Expand Down
1 change: 0 additions & 1 deletion xorp/rtrmgr/module_command.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ ModuleCommand::ModuleCommand(TemplateTree& template_tree,
_status_method(NULL),
_startup_method(NULL),
_shutdown_method(NULL),
_execute_done(false),
_verbose(template_tree.verbose())
{
XLOG_ASSERT(cmd_name == "%modinfo");
Expand Down
1 change: 0 additions & 1 deletion xorp/rtrmgr/module_command.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ private:
Action* _status_method;
Action* _startup_method;
Action* _shutdown_method;
bool _execute_done;
bool _verbose; // Set to true if output is verbose
};

Expand Down