commit 6973015fd089677a1c7ceb9385809b651158a1da
author Michal Vasko <mvasko@cesnet.cz> Fri Oct 09 16:30:07 2020 +0200
committer GitHub <noreply@github.com> Fri Oct 09 16:30:07 2020 +0200
tree 31f50384fd378736333efb00abf29ad33bceba49
parent 08dc70b35e981a9c51c093484702323d9f1ee12e

uncrustify FORMAT set various uncrustify options

PR #1228

src/printer_json.c

diff --git a/src/printer_json.c b/src/printer_json.c
index 3e488de..b4f401a 100644
--- a/src/printer_json.c
+++ b/src/printer_json.c
@@ -77,7 +77,7 @@
         /* compare node names */
         struct lyd_node_opaq *onode1 = (struct lyd_node_opaq *)node1;
         struct lyd_node_opaq *onode2 = (struct lyd_node_opaq *)node2;
-        if (onode1->name != onode2->name || onode1->prefix.id != onode2->prefix.id) {
+        if ((onode1->name != onode2->name) || (onode1->prefix.id != onode2->prefix.id)) {
             return 0;
         }
     }
@@ -133,7 +133,7 @@
 
     LEVEL_DEC;
     ly_set_rm_index(&ctx->open, ctx->open.count - 1, NULL);
-    if (schema && schema->nodetype == LYS_LEAFLIST) {
+    if (schema && (schema->nodetype == LYS_LEAFLIST)) {
         /* leaf-list's content is always printed on a single line */
         ly_print_(ctx->out, "]");
     } else {
@@ -203,7 +203,7 @@
     } else {
         const char *pref1 = node_prefix(node1);
         const char *pref2 = node_prefix(node2);
-        if ((pref1 && pref2) && pref1 == pref2) {
+        if ((pref1 && pref2) && (pref1 == pref2)) {
             return 0;
         } else {
             return 1;
@@ -264,13 +264,13 @@
 json_print_member(struct jsonpr_ctx *ctx, const struct lyd_node *node, ly_bool is_attr)
 {
     PRINT_COMMA;
-    if (LEVEL == 1 || json_nscmp(node, (const struct lyd_node *)node->parent)) {
+    if ((LEVEL == 1) || json_nscmp(node, (const struct lyd_node *)node->parent)) {
         /* print "namespace" */
         ly_print_(ctx->out, "%*s\"%s%s:%s\":%s", INDENT, is_attr ? "@" : "",
-                 node_prefix(node), node->schema->name, DO_FORMAT ? " " : "");
+                node_prefix(node), node->schema->name, DO_FORMAT ? " " : "");
     } else {
         ly_print_(ctx->out, "%*s\"%s%s\":%s", INDENT, is_attr ? "@" : "",
-                 node->schema->name, DO_FORMAT ? " " : "");
+                node->schema->name, DO_FORMAT ? " " : "");
     }
 
     return LY_SUCCESS;
@@ -317,7 +317,7 @@
     }
 
     /* print the member */
-    if (module_name && (!parent || node_prefix(parent) != module_name)) {
+    if (module_name && (!parent || (node_prefix(parent) != module_name))) {
         ly_print_(ctx->out, "%*s\"%s%s:%s\":%s", INDENT, is_attr ? "@" : "", module_name, name, DO_FORMAT ? " " : "");
     } else {
         ly_print_(ctx->out, "%*s\"%s%s\":%s", INDENT, is_attr ? "@" : "", name, DO_FORMAT ? " " : "");
@@ -478,7 +478,7 @@
             LY_CHECK_RET(json_print_member2(ctx, NULL, LYD_JSON, NULL, "", 1));
         } else {
             LY_CHECK_RET(json_print_member2(ctx, node, ((struct lyd_node_opaq *)node)->format,
-                                            &((struct lyd_node_opaq *)node)->prefix, ((struct lyd_node_opaq *)node)->name, 1));
+                    &((struct lyd_node_opaq *)node)->prefix, ((struct lyd_node_opaq *)node)->name, 1));
         }
         ly_print_(ctx->out, "{%s", (DO_FORMAT ? "\n" : ""));
         LEVEL_INC;
@@ -600,12 +600,12 @@
         has_content = 1;
     }
 
-    if (!node->schema || node->schema->nodetype != LYS_LIST) {
+    if (!node->schema || (node->schema->nodetype != LYS_LIST)) {
         ly_print_(ctx->out, "%s{%s", (is_open_array(ctx, node) && ctx->level_printed >= ctx->level) ? "," : "",
                 (DO_FORMAT && has_content) ? "\n" : "");
     } else {
         ly_print_(ctx->out, "%s%*s{%s", (is_open_array(ctx, node) && ctx->level_printed >= ctx->level) ? "," : "",
-                 INDENT, (DO_FORMAT && has_content) ? "\n" : "");
+                INDENT, (DO_FORMAT && has_content) ? "\n" : "");
     }
     LEVEL_INC;
 
@@ -687,7 +687,7 @@
         }
     }
 
-    if (is_open_array(ctx, node) && (!node->next || node->next->schema != node->schema)) {
+    if (is_open_array(ctx, node) && (!node->next || (node->next->schema != node->schema))) {
         json_print_array_close(ctx);
     }
 
@@ -811,7 +811,7 @@
 json_print_node(struct jsonpr_ctx *ctx, const struct lyd_node *node)
 {
     if (!ly_should_print(node, ctx->options)) {
-        if (is_open_array(ctx, node) && (!node->next || node->next->schema != node->schema)) {
+        if (is_open_array(ctx, node) && (!node->next || (node->next->schema != node->schema))) {
             json_print_array_close(ctx);
         }
         return LY_SUCCESS;