commit 5044be38aca97127d349f37fefe7ed215d970bce
author Radek Krejci <rkrejci@cesnet.cz> Mon Jan 18 17:05:51 2016 +0100
committer Radek Krejci <rkrejci@cesnet.cz> Mon Jan 18 17:08:55 2016 +0100
tree 3a9ccac3bdda8f1c87d036f3a689f5120e3a6056
parent c5b6b912ef4289552744f157e59c818b2a58ee13

printers FEATURE add printer options

Add generic 'options' parameter to the data printer functions.
Currently it implements LYP_WITHSIBLINGS option to print besides
the provided data node also the sibling nodes/trees.

src/printer_json.c

diff --git a/src/printer_json.c b/src/printer_json.c
index 77b1d84..00f1743 100644
--- a/src/printer_json.c
+++ b/src/printer_json.c
@@ -34,7 +34,7 @@
 #define INDENT ""
 #define LEVEL (level*2)
 
-void json_print_nodes(struct lyout *out, int level, const struct lyd_node *root);
+static void json_print_nodes(struct lyout *out, int level, const struct lyd_node *root, int withsiblings);
 
 static int
 json_print_string(struct lyout *out, const char *text)
@@ -179,7 +179,7 @@
         json_print_attrs(out, level + 1, node);
         ly_print(out, "%*s}%s", LEVEL, INDENT, node->child ? ",\n" : "");
     }
-    json_print_nodes(out, level, node->child);
+    json_print_nodes(out, level, node->child, 1);
     level--;
     ly_print(out, "%*s}", LEVEL, INDENT);
 }
@@ -230,7 +230,7 @@
                 json_print_attrs(out, level + 1, node);
                 ly_print(out, "%*s}%s", LEVEL, INDENT, list->child ? ",\n" : "");
             }
-            json_print_nodes(out, level, list->child);
+            json_print_nodes(out, level, list->child, 1);
             --level;
             ly_print(out, "%*s}", LEVEL, INDENT);
             --level;
@@ -312,8 +312,8 @@
     }
 }
 
-void
-json_print_nodes(struct lyout *out, int level, const struct lyd_node *root)
+static void
+json_print_nodes(struct lyout *out, int level, const struct lyd_node *root, int withsiblings)
 {
     const struct lyd_node *node, *iter;
 
@@ -368,12 +368,16 @@
             LOGINT;
             break;
         }
+
+        if (!withsiblings) {
+            break;
+        }
     }
     ly_print(out, "\n");
 }
 
 int
-json_print_data(struct lyout *out, const struct lyd_node *root)
+json_print_data(struct lyout *out, const struct lyd_node *root, int options)
 {
     int level = 0;
 
@@ -381,7 +385,7 @@
     ly_print(out, "{\n");
 
     /* content */
-    json_print_nodes(out, level + 1, root);
+    json_print_nodes(out, level + 1, root, options & LYP_WITHSIBLINGS);
 
     /* end */
     ly_print(out, "}\n");