From: Igor Maravic <[email protected]> Eclipse automaticaly striped trailing ws
Signed-off-by: Igor Maravic <[email protected]> --- xorp/libxipc/xrl_atom.cc | 8 ++++---- xorp/libxipc/xrl_atom.hh | 4 ++-- xorp/rtrmgr/unexpanded_xrl.cc | 8 ++++---- xorp/rtrmgr/xorp_client.cc | 18 +++++++++--------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/xorp/libxipc/xrl_atom.cc b/xorp/libxipc/xrl_atom.cc index 5106e4a..a31d54a 100644 --- a/xorp/libxipc/xrl_atom.cc +++ b/xorp/libxipc/xrl_atom.cc @@ -9,13 +9,13 @@ // Redistribution and/or modification of this program under the terms of // any other version of the GNU Lesser General Public License is not // permitted. -// +// // This program is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For more details, // see the GNU Lesser General Public License, Version 2.1, a copy of // which can be found in the XORP LICENSE.lgpl file. -// +// // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA; // http://xorp.net @@ -945,7 +945,7 @@ size_t XrlAtom::unpack_ipv6(const uint8_t* buffer) { uint32_t a[4]; - + if (_type == xrlatom_no_type) { memcpy(a, buffer, sizeof(a)); _ipv6 = new IPv6(a); @@ -1168,7 +1168,7 @@ XrlAtom::unpack_binary(const uint8_t* buffer, size_t buffer_bytes) _binary = 0; return 0; } - + if (_type != xrlatom_no_type) delete _binary; diff --git a/xorp/libxipc/xrl_atom.hh b/xorp/libxipc/xrl_atom.hh index 3a4f73f..ba996d6 100644 --- a/xorp/libxipc/xrl_atom.hh +++ b/xorp/libxipc/xrl_atom.hh @@ -9,13 +9,13 @@ // Redistribution and/or modification of this program under the terms of // any other version of the GNU Lesser General Public License is not // permitted. -// +// // This program is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For more details, // see the GNU Lesser General Public License, Version 2.1, a copy of // which can be found in the XORP LICENSE.lgpl file. -// +// // XORP, Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA; // http://xorp.net diff --git a/xorp/rtrmgr/unexpanded_xrl.cc b/xorp/rtrmgr/unexpanded_xrl.cc index 6f48291..fa07b6c 100644 --- a/xorp/rtrmgr/unexpanded_xrl.cc +++ b/xorp/rtrmgr/unexpanded_xrl.cc @@ -7,13 +7,13 @@ // 1991 as published by the Free Software Foundation. Redistribution // and/or modification of this program under the terms of any other // version of the GNU General Public License is not permitted. -// +// // This program is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For more details, // see the GNU General Public License, Version 2, a copy of which can be // found in the XORP LICENSE.gpl file. -// +// // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA; // http://xorp.net @@ -32,7 +32,7 @@ UnexpandedXrl::UnexpandedXrl(const MasterConfigTreeNode& node, - const XrlAction& action) + const XrlAction& action) : _node(node), _action(action), _xrl(NULL) @@ -47,7 +47,7 @@ UnexpandedXrl::~UnexpandedXrl() /** * Expand expands the variables in the unexpanded XRL, and creates an - * XRL that we can actually send. + * XRL that we can actually send. */ Xrl* UnexpandedXrl::expand(string& errmsg) const diff --git a/xorp/rtrmgr/xorp_client.cc b/xorp/rtrmgr/xorp_client.cc index 1bbd81e..a1df523 100644 --- a/xorp/rtrmgr/xorp_client.cc +++ b/xorp/rtrmgr/xorp_client.cc @@ -7,13 +7,13 @@ // 1991 as published by the Free Software Foundation. Redistribution // and/or modification of this program under the terms of any other // version of the GNU General Public License is not permitted. -// +// // This program is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For more details, // see the GNU General Public License, Version 2, a copy of which can be // found in the XORP LICENSE.gpl file. -// +// // XORP Inc, 2953 Bunker Hill Lane, Suite 204, Santa Clara, CA 95054, USA; // http://xorp.net @@ -38,7 +38,7 @@ /* XorpClient */ /***********************************************************************/ -XorpClient::XorpClient(EventLoop& eventloop, XrlRouter& xrl_router) +XorpClient::XorpClient(EventLoop& eventloop, XrlRouter& xrl_router) : _eventloop(eventloop), _xrl_router(xrl_router) { @@ -49,8 +49,8 @@ XorpClient::~XorpClient() { } void -XorpClient::send_now(const Xrl& xrl, XrlRouter::XrlCallback cb, - const string& xrl_return_spec, bool do_exec) +XorpClient::send_now(const Xrl& xrl, XrlRouter::XrlCallback cb, + const string& xrl_return_spec, bool do_exec) { if (do_exec) { debug_msg("send_sync before sending\n"); @@ -61,7 +61,7 @@ XorpClient::send_now(const Xrl& xrl, XrlRouter::XrlCallback cb, debug_msg("DUMMY SEND: immediate callback dispatch\n"); if (!cb.is_empty()) { _delay_timer = _eventloop.new_oneoff_after_ms(0, - callback(this, &XorpClient::fake_send_done, + callback(this, &XorpClient::fake_send_done, xrl_return_spec, cb)); } debug_msg("send_sync after sending\n"); @@ -71,10 +71,10 @@ XorpClient::send_now(const Xrl& xrl, XrlRouter::XrlCallback cb, /** * fake_send_done decouples the XRL response callback for debug_mode calls * to send_now, so that the callback doesn't happen until after - * send_now has returned. + * send_now has returned. */ void XorpClient::fake_send_done(string xrl_return_spec, - XrlRouter::XrlCallback cb) + XrlRouter::XrlCallback cb) { XrlArgs args = fake_return_args(xrl_return_spec); cb->dispatch(XrlError::OKAY(), &args); @@ -84,7 +84,7 @@ void XorpClient::fake_send_done(string xrl_return_spec, * fake_return_args is purely needed for testing, so that XRLs that * should return a value don't completely fail */ -XrlArgs +XrlArgs XorpClient::fake_return_args(const string& xrl_return_spec) { list<string> args; -- 1.7.5.4 _______________________________________________ Xorp-hackers mailing list [email protected] http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-hackers
