summaryrefslogtreecommitdiff
path: root/src/cnode
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2010-11-29 17:36:06 -0800
committerAn-Cheng Huang <ancheng@vyatta.com>2010-11-29 17:36:06 -0800
commit9e5864d615b80c55367fcea8d419a28e557979ef (patch)
tree4da3e93051965662b63baccde009ba8599083c92 /src/cnode
parent47783a51d51a6f07c743a28f0ebe50a05a5c1002 (diff)
downloadvyatta-cfg-9e5864d615b80c55367fcea8d419a28e557979ef.tar.gz
vyatta-cfg-9e5864d615b80c55367fcea8d419a28e557979ef.zip
disable activate/deactivate for mendocino as discussed.
Diffstat (limited to 'src/cnode')
-rw-r--r--src/cnode/cnode-algorithm.cpp27
1 files changed, 5 insertions, 22 deletions
diff --git a/src/cnode/cnode-algorithm.cpp b/src/cnode/cnode-algorithm.cpp
index fa3912c..4480352 100644
--- a/src/cnode/cnode-algorithm.cpp
+++ b/src/cnode/cnode-algorithm.cpp
@@ -33,11 +33,6 @@ static const string PFX_DIFF_UPD = ">"; // changed
static const string PFX_DIFF_NONE = " ";
static const string PFX_DIFF_NULL = "";
-static const string PFX_DEACT_D = "!"; // deactivated
-static const string PFX_DEACT_DP = "D"; // deactivate pending
-static const string PFX_DEACT_AP = "A"; // activate pending
-static const string PFX_DEACT_NONE = " ";
-
////// static (internal) functions
static void
@@ -78,23 +73,11 @@ static void
_diff_print_indent(CfgNode *cfg1, CfgNode *cfg2, int level,
const char *pfx_diff)
{
- const char *pfx_deact = PFX_DEACT_NONE.c_str();
- bool de1 = (cfg1 ? cfg1->isDeactivated() : false);
- bool de2 = (cfg2 ? cfg2->isDeactivated() : false);
- if (de1) {
- if (de2) {
- pfx_deact = PFX_DEACT_D.c_str();
- } else {
- pfx_deact = PFX_DEACT_AP.c_str();
- }
- } else {
- if (de2) {
- pfx_deact = PFX_DEACT_DP.c_str();
- }
- // 4th case handled by default
- }
-
- printf("%s %s", pfx_deact, pfx_diff);
+ /* note: activate/deactivate state output was handled here. pending
+ * redesign, the output notation will be changed to "per-subtree"
+ * marking, so the output will be handled with the rest of the node.
+ */
+ printf("%s", pfx_diff);
for (int i = 0; i < level; i++) {
printf(" ");
}