diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-11-10 14:08:51 -0800 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-11-10 14:08:51 -0800 |
| commit | 5a0e77fe4729bd9df3339c1d85efefdfc8ef1cbb (patch) | |
| tree | 2272c5abc545fcfd13580529a02e820440bd5d75 /src/cnode | |
| parent | 51d0de81c63be3d0768fffe21955d2997de67c32 (diff) | |
| download | vyatta-cfg-5a0e77fe4729bd9df3339c1d85efefdfc8ef1cbb.tar.gz vyatta-cfg-5a0e77fe4729bd9df3339c1d85efefdfc8ef1cbb.zip | |
switch to new output framework
* change showCfg to use new code.
* remove old files.
Diffstat (limited to 'src/cnode')
| -rw-r--r-- | src/cnode/cnode-algorithm.cpp | 1 | ||||
| -rw-r--r-- | src/cnode/cnode.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/cnode/cnode-algorithm.cpp b/src/cnode/cnode-algorithm.cpp index 9f67d7d..58e8a65 100644 --- a/src/cnode/cnode-algorithm.cpp +++ b/src/cnode/cnode-algorithm.cpp @@ -131,6 +131,7 @@ _diff_print_comment(CfgNode *cfg1, CfgNode *cfg2, int level) } else { // same node => no diff pfx_diff = PFX_DIFF_NULL.c_str(); + comment = cfg1->getComment(); } if (comment == "") { // no comment diff --git a/src/cnode/cnode.cpp b/src/cnode/cnode.cpp index d1f519e..4ebbb2b 100644 --- a/src/cnode/cnode.cpp +++ b/src/cnode/cnode.cpp @@ -47,6 +47,7 @@ CfgNode::CfgNode(Cstore& cstore, vector<string>& path_comps, _is_default = cstore.cfgPathDefault(path_comps, active); _is_deactivated = cstore.cfgPathDeactivated(path_comps, active); cstore.cfgPathGetComment(path_comps, _comment, active); + // ignore return if (_is_leaf && _is_value) { /* recursion should never reach here. if path is specified by user, |