From 0c7651705b1d1696f2cd449d69c9921e19484f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
Date: Fri, 12 Dec 2025 15:59:39 +0100
Subject: [PATCH] confd, statd, libsrx: Adapt to libyang4 api

---
 src/confd/src/core.c     | 2 +-
 src/libsrx/src/srx_val.c | 8 ++++----
 src/libsrx/src/srx_val.h | 6 +++---
 src/statd/journal.c      | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/confd/src/core.c b/src/confd/src/core.c
index e24dca9e..9460de1a 100644
--- a/src/confd/src/core.c
+++ b/src/confd/src/core.c
@@ -184,7 +184,7 @@ static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod
 		/* Debug: print diff to file */
 		FILE *f = fopen("/tmp/confd-diff.json", "w");
 		if (f) {
-			lyd_print_file(f, diff, LYD_JSON, LYD_PRINT_WITHSIBLINGS);
+			lyd_print_file(f, diff, LYD_JSON, LYD_PRINT_SIBLINGS);
 			fclose(f);
 		}
 #endif
diff --git a/src/libsrx/src/srx_val.c b/src/libsrx/src/srx_val.c
index ac820458..6ac1fcd2 100644
--- a/src/libsrx/src/srx_val.c
+++ b/src/libsrx/src/srx_val.c
@@ -149,7 +149,7 @@ bool srx_isset(sr_session_ctx_t *session, const char *fmt, ...)
 	return isset;
 }
 
-static int set_vaitem(sr_session_ctx_t *session, const sr_val_t *val, sr_edit_options_t opts,
+static int set_vaitem(sr_session_ctx_t *session, const sr_val_t *val, uint32_t opts,
 		      const char *fmt, va_list ap)
 {
 	va_list apdup;
@@ -171,7 +171,7 @@ static int set_vaitem(sr_session_ctx_t *session, const sr_val_t *val, sr_edit_op
 	return sr_set_item(session, xpath, val, opts);
 }
 
-int srx_set_item(sr_session_ctx_t *session, const sr_val_t *val, sr_edit_options_t opts,
+int srx_set_item(sr_session_ctx_t *session, const sr_val_t *val, uint32_t opts,
 		 const char *fmt, ...)
 {
 	va_list ap;
@@ -184,7 +184,7 @@ int srx_set_item(sr_session_ctx_t *session, const sr_val_t *val, sr_edit_options
 	return rc;
 }
 
-int srx_set_bool(sr_session_ctx_t *session, bool ena, sr_edit_options_t opts,
+int srx_set_bool(sr_session_ctx_t *session, bool ena, uint32_t opts,
 		 const char *fmt, ...)
 {
 	sr_val_t val = {
@@ -202,7 +202,7 @@ int srx_set_bool(sr_session_ctx_t *session, bool ena, sr_edit_options_t opts,
 }
 
 
-int srx_set_str(sr_session_ctx_t *session, const char *str, sr_edit_options_t opts,
+int srx_set_str(sr_session_ctx_t *session, const char *str, uint32_t opts,
 		const char *fmt, ...)
 {
 	char *xpath;
diff --git a/src/libsrx/src/srx_val.h b/src/libsrx/src/srx_val.h
index 1b2d1ada..82378f0d 100644
--- a/src/libsrx/src/srx_val.h
+++ b/src/libsrx/src/srx_val.h
@@ -16,11 +16,11 @@ int srx_free_changes(struct lyd_node *tree);
 
 bool srx_isset(sr_session_ctx_t *session, const char *fmt, ...);
 
-int srx_set_item(sr_session_ctx_t *, const sr_val_t *, sr_edit_options_t, const char *, ...)
+int srx_set_item(sr_session_ctx_t *, const sr_val_t *, uint32_t, const char *, ...)
 	__attribute__ ((format (printf, 4, 5)));
-int srx_set_str(sr_session_ctx_t *, const char *, sr_edit_options_t, const char *fmt, ...)
+int srx_set_str(sr_session_ctx_t *, const char *, uint32_t, const char *fmt, ...)
 	 __attribute__ ((format (printf, 4, 5)));
-int srx_set_bool(sr_session_ctx_t *session, bool ena, sr_edit_options_t opts, const char *fmt, ...)
+int srx_set_bool(sr_session_ctx_t *session, bool ena, uint32_t opts, const char *fmt, ...)
 	 __attribute__ ((format (printf, 4, 5)));
 
 char *srx_get_str  (sr_session_ctx_t *session, const char *fmt, ...)
diff --git a/src/statd/journal.c b/src/statd/journal.c
index a869e13d..b515c1f1 100644
--- a/src/statd/journal.c
+++ b/src/statd/journal.c
@@ -81,7 +81,7 @@ static int create_snapshot(const struct lyd_node *tree)
 	int ret;
 
 	/* Write latest snapshot as uncompressed operational.json for easy access */
-	ret = lyd_print_path(DUMP_FILE, tree, LYD_JSON, LYD_PRINT_WITHSIBLINGS);
+	ret = lyd_print_path(DUMP_FILE, tree, LYD_JSON, LYD_PRINT_SIBLINGS);
 	if (ret != LY_SUCCESS) {
 		ERROR("Error, writing operational.json: %d", ret);
 		return -1;