[Xorp-hackers] [PATCH] trivial: ws fixes
igorm at etf.rs
igorm at etf.rs
Wed Mar 14 03:13:12 PDT 2012
From: Igor Maravic <igorm at etf.rs>
Automaticaly fixed trailing ws with Eclipse
---
xorp/libxorp/range.hh | 8 ++--
xorp/rtrmgr/conf_tree.cc | 14 ++++----
xorp/rtrmgr/template_tree.cc | 16 +++++-----
xorp/rtrmgr/template_tree_node.cc | 10 +++---
xorp/rtrmgr/template_tree_node.hh | 62 ++++++++++++++++++------------------
5 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/xorp/libxorp/range.hh b/xorp/libxorp/range.hh
index 538610f..a059788 100644
--- a/xorp/libxorp/range.hh
+++ b/xorp/libxorp/range.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
@@ -76,7 +76,7 @@ public:
/**
* Default constructor
*/
- U32Range() { Range<uint32_t>::_low =
+ U32Range() { Range<uint32_t>::_low =
Range<uint32_t>::_high = 0; }
/**
@@ -207,7 +207,7 @@ public:
Range<T>::_low = Range<T>::_high = T(from_cstr);
else if (delim > 0 && (from_string.length() - delim > 2)) {
Range<T>::_low = T(from_string.substr(0, delim).c_str());
- Range<T>::_high = T(from_string.substr(delim + 2,
+ Range<T>::_high = T(from_string.substr(delim + 2,
from_string.length())
.c_str());
} else {
diff --git a/xorp/rtrmgr/conf_tree.cc b/xorp/rtrmgr/conf_tree.cc
index f52ace5..3889ecf 100644
--- a/xorp/rtrmgr/conf_tree.cc
+++ b/xorp/rtrmgr/conf_tree.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
@@ -112,7 +112,7 @@ ConfigTree::path_as_segments() const
ConfigTreeNode* ctn = _current_node;
while (ctn->parent() != NULL) {
- path_segments.push_front(ConfPathSegment(ctn->segname(),
+ path_segments.push_front(ConfPathSegment(ctn->segname(),
ctn->type(), ctn->node_id()));
ctn = ctn->parent();
}
@@ -271,7 +271,7 @@ ConfigTree::add_node(const string& segment, int type,
void
-ConfigTree::terminal_value(const string& value, int type, ConfigOperator op)
+ConfigTree::terminal_value(const string& value, int type, ConfigOperator op)
throw (ParseError)
{
string error_msg;
@@ -440,7 +440,7 @@ ConfigTree::find_config_node(const list<string>& path_segments) const
string
-ConfigTree::show_subtree(bool show_top, const list<string>& path_segments,
+ConfigTree::show_subtree(bool show_top, const list<string>& path_segments,
bool numbered, bool suppress_default_values) const
{
const ConfigTreeNode *found = find_config_node(path_segments);
@@ -464,7 +464,7 @@ ConfigTree::show_tree(bool numbered) const
return const_root_node().show_subtree(/* show_top */ false,
/* depth */ 0,
/* indent */ 0,
- /* do_indent */ true,
+ /* do_indent */ true,
numbered,
/* annotate */ true,
/* suppress_default_values */ false);
@@ -476,7 +476,7 @@ ConfigTree::show_unannotated_tree(bool numbered) const
return const_root_node().show_subtree(/* show_top */ false,
/* depth */ 0,
/* indent */ 0,
- /* do_indent */ true,
+ /* do_indent */ true,
numbered,
/* annotate */ false,
/* suppress_default_values */ false);
diff --git a/xorp/rtrmgr/template_tree.cc b/xorp/rtrmgr/template_tree.cc
index e228bb5..a4d3e98 100644
--- a/xorp/rtrmgr/template_tree.cc
+++ b/xorp/rtrmgr/template_tree.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
@@ -64,7 +64,7 @@ TemplateTree::~TemplateTree()
delete _root_node;
}
-bool
+bool
TemplateTree::load_template_tree(const string& config_template_dir,
string& error_msg)
{
@@ -123,9 +123,9 @@ TemplateTree::load_template_tree(const string& config_template_dir,
return true;
}
-bool
+bool
TemplateTree::parse_file(const string& filename,
- const string& config_template_dir, string& error_msg)
+ const string& config_template_dir, string& error_msg)
{
if (init_template_parser(filename.c_str(), this) < 0) {
complete_template_parser();
@@ -142,7 +142,7 @@ TemplateTree::parse_file(const string& filename,
}
if (_path_segments.size() != 0) {
complete_template_parser();
- error_msg = c_format("File %s is not terminated properly",
+ error_msg = c_format("File %s is not terminated properly",
filename.c_str());
return false;
}
@@ -443,7 +443,7 @@ TemplateTree::find_node(const list<string>& path_segments) const
}
const TemplateTreeNode*
-TemplateTree::find_node_by_type(const list<ConfPathSegment>& path_segments)
+TemplateTree::find_node_by_type(const list<ConfPathSegment>& path_segments)
const
{
TemplateTreeNode* ttn = _root_node;
@@ -490,7 +490,7 @@ TemplateTree::find_node_by_type(const list<ConfPathSegment>& path_segments)
// XXX: the type check failed.
// If there is a matching template node type of type NODE_TEXT,
// then we accept this node.
- //
+ //
// The upside of this is that we can use a single template
// node like "foo @: txt" that can be used with, say,
// IPv4 or IPv6 addresses, a host name, or any other text string.
diff --git a/xorp/rtrmgr/template_tree_node.cc b/xorp/rtrmgr/template_tree_node.cc
index b4d7d50..b89e5ec 100644
--- a/xorp/rtrmgr/template_tree_node.cc
+++ b/xorp/rtrmgr/template_tree_node.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
@@ -946,7 +946,7 @@ TemplateTreeNode::find_child_varname_node(const list<string>& var_parts)
// The name might refer to this node
if (var_parts.size() == 1) {
- if ((var_parts.front() == "@")
+ if ((var_parts.front() == "@")
|| (var_parts.front() == _segname)
|| (var_parts.front() == "<>")
|| (var_parts.front() == "#")) {
@@ -1586,7 +1586,7 @@ IntTemplate::type_match(const string& orig, string& error_msg) const
error_msg = "value must be an integer";
} else {
error_msg = "value must be numeric";
- }
+ }
return false;
}
return true;
@@ -1613,7 +1613,7 @@ BoolTemplate::BoolTemplate(TemplateTree& template_tree,
if (initializer.empty())
return;
-
+
if (! type_match(initializer, error_msg)) {
error_msg = c_format("Bad Bool type value \"%s\": %s.",
initializer.c_str(), error_msg.c_str());
diff --git a/xorp/rtrmgr/template_tree_node.hh b/xorp/rtrmgr/template_tree_node.hh
index 88e257e..427dee6 100644
--- a/xorp/rtrmgr/template_tree_node.hh
+++ b/xorp/rtrmgr/template_tree_node.hh
@@ -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
@@ -73,7 +73,7 @@ class TemplateTree;
class TemplateTreeNode {
public:
- TemplateTreeNode(TemplateTree& template_tree, TemplateTreeNode* parent,
+ TemplateTreeNode(TemplateTree& template_tree, TemplateTreeNode* parent,
const string& path, const string& varname);
virtual ~TemplateTreeNode();
@@ -115,7 +115,7 @@ public:
#if 0
bool check_template_tree(string& error_msg) const;
#endif
- bool check_command_tree(const list<string>& commands,
+ bool check_command_tree(const list<string>& commands,
bool include_intermediate_nodes,
bool include_read_only_nodes,
bool include_permanent_nodes,
@@ -238,8 +238,8 @@ private:
class UIntTemplate : public TemplateTreeNode {
public:
- UIntTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ UIntTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
string typestr() const { return string("uint"); }
@@ -254,8 +254,8 @@ private:
class UIntRangeTemplate : public TemplateTreeNode {
public:
- UIntRangeTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ UIntRangeTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
~UIntRangeTemplate();
@@ -271,8 +271,8 @@ private:
class IntTemplate : public TemplateTreeNode {
public:
- IntTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ IntTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
string typestr() const { return string("int"); }
TTNodeType type() const { return NODE_INT; }
@@ -286,8 +286,8 @@ private:
class ArithTemplate : public TemplateTreeNode {
public:
- ArithTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ ArithTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
string typestr() const { return string("uint"); }
TTNodeType type() const { return NODE_ARITH; }
@@ -301,8 +301,8 @@ private:
class TextTemplate : public TemplateTreeNode {
public:
- TextTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ TextTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
string typestr() const { return string("text"); }
@@ -317,8 +317,8 @@ private:
class BoolTemplate : public TemplateTreeNode {
public:
- BoolTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ BoolTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
string typestr() const { return string("bool"); }
@@ -333,7 +333,7 @@ private:
class IPv4Template : public TemplateTreeNode {
public:
- IPv4Template(TemplateTree& template_tree, TemplateTreeNode* parent,
+ IPv4Template(TemplateTree& template_tree, TemplateTreeNode* parent,
const string& path, const string& varname,
const string& initializer) throw (ParseError);
~IPv4Template();
@@ -350,8 +350,8 @@ private:
class IPv4NetTemplate : public TemplateTreeNode {
public:
- IPv4NetTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ IPv4NetTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
~IPv4NetTemplate();
@@ -367,8 +367,8 @@ private:
class IPv4RangeTemplate : public TemplateTreeNode {
public:
- IPv4RangeTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ IPv4RangeTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
~IPv4RangeTemplate();
@@ -385,7 +385,7 @@ private:
class IPv6Template : public TemplateTreeNode {
public:
IPv6Template(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
~IPv6Template();
@@ -401,8 +401,8 @@ private:
class IPv6NetTemplate : public TemplateTreeNode {
public:
- IPv6NetTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ IPv6NetTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
~IPv6NetTemplate();
@@ -419,7 +419,7 @@ private:
class IPv6RangeTemplate : public TemplateTreeNode {
public:
IPv6RangeTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
~IPv6RangeTemplate();
@@ -435,8 +435,8 @@ private:
class MacaddrTemplate : public TemplateTreeNode {
public:
- MacaddrTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
- const string& path, const string& varname,
+ MacaddrTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ const string& path, const string& varname,
const string& initializer) throw (ParseError);
~MacaddrTemplate();
@@ -452,7 +452,7 @@ private:
class UrlFileTemplate : public TemplateTreeNode {
public:
- UrlFileTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ UrlFileTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
const string& path, const string& varname,
const string& initializer) throw (ParseError);
@@ -468,7 +468,7 @@ private:
class UrlFtpTemplate : public TemplateTreeNode {
public:
- UrlFtpTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ UrlFtpTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
const string& path, const string& varname,
const string& initializer) throw (ParseError);
@@ -484,7 +484,7 @@ private:
class UrlHttpTemplate : public TemplateTreeNode {
public:
- UrlHttpTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ UrlHttpTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
const string& path, const string& varname,
const string& initializer) throw (ParseError);
@@ -500,7 +500,7 @@ private:
class UrlTftpTemplate : public TemplateTreeNode {
public:
- UrlTftpTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
+ UrlTftpTemplate(TemplateTree& template_tree, TemplateTreeNode* parent,
const string& path, const string& varname,
const string& initializer) throw (ParseError);
--
1.7.5.4
More information about the Xorp-hackers
mailing list