uncrustify FORMAT set various uncrustify options
PR #1228
diff --git a/src/diff.c b/src/diff.c
index dff6acb..7e7782d 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -103,7 +103,7 @@
/* duplicate the subtree (and connect to the diff if possible) */
LY_CHECK_RET(lyd_dup_single(node, (struct lyd_node_inner *)diff_parent,
- LYD_DUP_RECURSIVE | LYD_DUP_NO_META | LYD_DUP_WITH_PARENTS, &dup));
+ LYD_DUP_RECURSIVE | LYD_DUP_NO_META | LYD_DUP_WITH_PARENTS, &dup));
/* find the first duplicated parent */
if (!diff_parent) {
@@ -293,9 +293,9 @@
*/
/* orig-default */
- if ((options & LYD_DIFF_DEFAULTS) && (schema->nodetype == LYS_LEAFLIST)
- && ((*op == LYD_DIFF_OP_REPLACE) || (*op == LYD_DIFF_OP_NONE))
- && ((first->flags & LYD_DEFAULT) != (second->flags & LYD_DEFAULT))) {
+ if ((options & LYD_DIFF_DEFAULTS) && (schema->nodetype == LYS_LEAFLIST) &&
+ ((*op == LYD_DIFF_OP_REPLACE) || (*op == LYD_DIFF_OP_NONE)) &&
+ ((first->flags & LYD_DEFAULT) != (second->flags & LYD_DEFAULT))) {
if (first->flags & LYD_DEFAULT) {
*orig_default = "true";
} else {
@@ -353,7 +353,7 @@
if (*op == LYD_DIFF_OP_CREATE) {
/* insert the instance */
LY_ARRAY_RESIZE_ERR_RET(schema->module->ctx, userord_item->inst, LY_ARRAY_COUNT(userord_item->inst) + 1,
- ; , LY_EMEM);
+ ; , LY_EMEM);
if (second_pos < LY_ARRAY_COUNT(userord_item->inst)) {
memmove(userord_item->inst + second_pos + 1, userord_item->inst + second_pos,
(LY_ARRAY_COUNT(userord_item->inst) - second_pos) * sizeof *userord_item->inst);
@@ -454,9 +454,9 @@
*/
/* orig-default */
- if ((options & LYD_DIFF_DEFAULTS) && (schema->nodetype & LYD_NODE_TERM)
- && ((*op == LYD_DIFF_OP_REPLACE) || (*op == LYD_DIFF_OP_NONE))
- && ((first->flags & LYD_DEFAULT) != (second->flags & LYD_DEFAULT))) {
+ if ((options & LYD_DIFF_DEFAULTS) && (schema->nodetype & LYD_NODE_TERM) &&
+ ((*op == LYD_DIFF_OP_REPLACE) || (*op == LYD_DIFF_OP_NONE)) &&
+ ((first->flags & LYD_DEFAULT) != (second->flags & LYD_DEFAULT))) {
if (first->flags & LYD_DEFAULT) {
*orig_default = "true";
} else {
@@ -557,7 +557,7 @@
/* get all the attributes */
LY_CHECK_GOTO(lyd_diff_userord_attrs(iter_first, match_second, options, &userord, &op, &orig_default,
- &value, &orig_value, &key, &orig_key), cleanup);
+ &value, &orig_value, &key, &orig_key), cleanup);
/* there must be changes, it is deleted */
assert(op == LYD_DIFF_OP_DELETE);
@@ -592,7 +592,7 @@
/* check descendants, if any, recursively */
if (match_second) {
LY_CHECK_GOTO(lyd_diff_siblings_r(lyd_child_no_keys(iter_first), lyd_child_no_keys(match_second), options,
- 0, diff), cleanup);
+ 0, diff), cleanup);
}
if (nosiblings) {
@@ -627,7 +627,7 @@
if (lysc_is_userordered(iter_second->schema)) {
/* get all the attributes */
ret = lyd_diff_userord_attrs(match_first, iter_second, options, &userord, &op, &orig_default,
- &value, &orig_value, &key, &orig_key);
+ &value, &orig_value, &key, &orig_key);
/* add into diff if there are any changes */
if (!ret) {
@@ -788,7 +788,7 @@
/* simply insert into parent, no other children */
if (key_or_value) {
LOGERR(LYD_CTX(new_node), LY_EINVAL, "Node \"%s\" instance to insert next to not found.",
- new_node->schema->name);
+ new_node->schema->name);
return LY_EINVAL;
}
return lyd_insert_child(parent_node, new_node);
@@ -806,7 +806,7 @@
ret = lyd_find_sibling_val(*first_node, new_node->schema, key_or_value, 0, &anchor);
if (ret == LY_ENOTFOUND) {
LOGERR(LYD_CTX(new_node), LY_EINVAL, "Node \"%s\" instance to insert next to not found.",
- new_node->schema->name);
+ new_node->schema->name);
return LY_EINVAL;
} else if (ret) {
return ret;
@@ -1199,15 +1199,15 @@
sleaf = NULL;
}
- if (sleaf && sleaf->dflt
- && !sleaf->dflt->realtype->plugin->compare(sleaf->dflt, &((struct lyd_node_term *)src_diff)->value)) {
+ if (sleaf && sleaf->dflt &&
+ !sleaf->dflt->realtype->plugin->compare(sleaf->dflt, &((struct lyd_node_term *)src_diff)->value)) {
/* we deleted it, so a default value was in-use, and it matches the created value -> operation NONE */
LY_CHECK_RET(lyd_diff_change_op(diff_match, LYD_DIFF_OP_NONE));
if (diff_match->schema->nodetype & LYD_NODE_TERM) {
/* add orig-dflt metadata */
LY_CHECK_RET(lyd_new_meta(diff_match, NULL, "yang:orig-default",
- diff_match->flags & LYD_DEFAULT ? "true" : "false", NULL));
+ diff_match->flags & LYD_DEFAULT ? "true" : "false", NULL));
}
} else if (!lyd_compare_single(diff_match, src_diff, 0)) {
/* deleted + created -> operation NONE */
@@ -1216,7 +1216,7 @@
if (diff_match->schema->nodetype & LYD_NODE_TERM) {
/* add orig-dflt metadata */
LY_CHECK_RET(lyd_new_meta(diff_match, NULL, "yang:orig-default",
- diff_match->flags & LYD_DEFAULT ? "true" : "false", NULL));
+ diff_match->flags & LYD_DEFAULT ? "true" : "false", NULL));
}
} else {
assert(sleaf);
@@ -1275,7 +1275,7 @@
if (diff_match->schema->nodetype & LYD_NODE_TERM) {
/* add orig-default meta because it is expected */
LY_CHECK_RET(lyd_new_meta(diff_match, NULL, "yang:orig-default",
- diff_match->flags & LYD_DEFAULT ? "true" : "false", NULL));
+ diff_match->flags & LYD_DEFAULT ? "true" : "false", NULL));
} else {
/* keep operation for all descendants (for now) */
LY_LIST_FOR(lyd_child_no_keys(diff_match), child) {