peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-22 01:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd, statd, libsrx: Adapt to libyang4 api

Browse Source
This commit is contained in:
Mattias Walström
2025-12-16 14:28:24 +01:00
parent 0ea3380349
commit 0c7651705b
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/core.c
+1 -1
View File
@@ -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
src/libsrx/src/srx_val.c
+4 -4
View File
@@ -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;
src/libsrx/src/srx_val.h
+3 -3
View File
@@ -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, ...)
src/statd/journal.c
+1 -1
View File
@@ -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;