Skip to content

Commit cc0212b

Browse files
committed
fixup! Merge branch 'devel'
1 parent f68a49e commit cc0212b

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

src/log.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ ly_vlog_build_path_reverse(enum LY_VLOG_ELEM elem_type, const void *elem, char *
430430
{
431431
int i, j;
432432
struct lys_node_list *slist;
433-
struct lys_node *sparent;
433+
struct lys_node *sparent = NULL;
434434
struct lyd_node *dlist, *diter;
435435
const struct lys_module *top_smodule = NULL;
436436
const char *name, *prefix = NULL, *val_end, *val_start;

src/tree_data.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,8 +1459,7 @@ lyd_new_path(struct lyd_node *data_tree, struct ly_ctx *ctx, const char *path, v
14591459
}
14601460

14611461
parsed = 0;
1462-
if ((schild->nodetype == LYS_LIST) && has_predicate
1463-
&& lyd_new_path_list_predicate(node, name, id, &parsed)) {
1462+
if ((schild->nodetype == LYS_LIST) && has_predicate && lyd_new_path_list_predicate(node, name, id, &parsed)) {
14641463
lyd_free(ret);
14651464
return NULL;
14661465
}
@@ -1480,6 +1479,7 @@ lyd_new_path(struct lyd_node *data_tree, struct ly_ctx *ctx, const char *path, v
14801479
/* prepare for another iteration */
14811480
parent = node;
14821481
sparent = schild;
1482+
prev_mod = lys_node_module(schild);
14831483

14841484
/* parse another node */
14851485
if ((r = parse_schema_nodeid(id, &mod_name, &mod_name_len, &name, &nam_len, &is_relative, &has_predicate, NULL, 0)) < 1) {

tools/lint/main_ni.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,6 @@ main_ni(int argc, char* argv[])
541541
/* we have options for printing default nodes, but data output not specified */
542542
fprintf(stderr, "yanglint warning: default mode is ignored when not printing data.\n");
543543
}
544-
545544
if (outformat_s && (options_parser || autodetection)) {
546545
/* we have options for printing data tree, but output is schema */
547546
fprintf(stderr, "yanglint warning: data parser options are ignored when printing schema.\n");

0 commit comments

Comments
 (0)