experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor adjustments to follow clixon programming style

Browse source
This commit is contained in:
Jan-Olof Carlson 2022-08-27 07:16:37 +00:00 • committed by Olof hagsand
parent ad7232d1ad
commit 2e3a5a6334
1 changed files with 52 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

95
apps/backend/backend_get.c
View file

@ -416,7 +416,8 @@ element2value(clicon_handle h,
*/ */
static int static int
xml_flag_default_value(cxobj *x, uint16_t flag) xml_flag_default_value(cxobj *x,
uint16_t flag)
{ {
yang_stmt *y; yang_stmt *y;
cg_var *cv; cg_var *cv;
@ -451,7 +452,8 @@ xml_flag_default_value(cxobj *x, uint16_t flag)
* @retval -1 Error * @retval -1 Error
*/ */
static int static int
xml_add_default_tag(cxobj *x, uint16_t flags) xml_add_default_tag(cxobj *x,
uint16_t flags)
{ {
int retval = -1; int retval = -1;
cxobj *xattr; cxobj *xattr;
@ -478,55 +480,62 @@ xml_add_default_tag(cxobj *x, uint16_t flags)
*/ */
static int static int
with_defaults(cxobj *xe, cxobj *xret) { with_defaults(cxobj *xe,
int retval = -1; cxobj *xret)
{
int retval = -1;
cxobj *xfind; cxobj *xfind;
char *mode; char *mode;
if ((xfind = xml_find(xe, "with-defaults")) != NULL) { if ((xfind = xml_find(xe, "with-defaults")) != NULL) {
if ((mode = xml_find_value(xfind, "body")) != NULL) { if ((mode = xml_find_value(xfind, "body")) == NULL)
goto done;
if (strcmp(mode, "explicit") == 0) { if (strcmp(mode, "explicit") == 0) {
/* Clear marked nodes */ /* Clear marked nodes */
if (xml_apply(xret, CX_ELMNT, (xml_applyfn_t*) xml_flag_reset,(void*) XML_FLAG_MARK) < 0) if (xml_apply(xret, CX_ELMNT, (xml_applyfn_t*) xml_flag_reset,(void*) XML_FLAG_MARK) < 0)
goto done; goto done;
/* Mark state nodes */ /* Mark state nodes */
if (xml_non_config_data(xret, NULL) < 0) if (xml_non_config_data(xret, NULL) < 0)
goto done; goto done;
/* Remove default configuration nodes*/ /* Remove default configuration nodes*/
if (xml_tree_prune_flags(xret, XML_FLAG_DEFAULT, XML_FLAG_MARK | XML_FLAG_DEFAULT) < 0) if (xml_tree_prune_flags(xret, XML_FLAG_DEFAULT, XML_FLAG_MARK | XML_FLAG_DEFAULT) < 0)
goto done; goto done;
/* TODO. Remove empty containers */ /* TODO. Remove empty containers */
goto ok;
} else if (strcmp(mode, "trim") == 0) { }
/* Remove default nodes from XML */ if (strcmp(mode, "trim") == 0) {
if (xml_tree_prune_flags(xret, XML_FLAG_DEFAULT, XML_FLAG_DEFAULT) < 0) /* Remove default nodes from XML */
goto done; if (xml_tree_prune_flags(xret, XML_FLAG_DEFAULT, XML_FLAG_DEFAULT) < 0)
/* Mark and remove nodes having schema default values */ goto done;
if (xml_apply(xret, CX_ELMNT, (xml_applyfn_t*) xml_flag_default_value, (void*) XML_FLAG_MARK) < 0) /* Mark and remove nodes having schema default values */
goto done; if (xml_apply(xret, CX_ELMNT, (xml_applyfn_t*) xml_flag_default_value, (void*) XML_FLAG_MARK) < 0)
if (xml_tree_prune_flags(xret, XML_FLAG_MARK, XML_FLAG_MARK) goto done;
< 0) if (xml_tree_prune_flags(xret, XML_FLAG_MARK, XML_FLAG_MARK)
goto done; < 0)
/* TODO. Remove empty containers */ goto done;
/* TODO. Remove empty containers */
} else if (strcmp(mode, "report-all-tagged") == 0) { goto ok;
if (xmlns_set(xret, "wd", "urn:ietf:params:xml:ns:netconf:default:1.0") < 0) }
goto done; if (strcmp(mode, "report-all-tagged") == 0) {
/* Mark nodes having default schema values */ if (xmlns_set(xret, "wd", "urn:ietf:params:xml:ns:netconf:default:1.0") < 0)
if (xml_apply(xret, CX_ELMNT, (xml_applyfn_t*) xml_flag_default_value, (void*) XML_FLAG_MARK) < 0) goto done;
goto done; /* Mark nodes having default schema values */
/* Add tag attributes to default nodes */ if (xml_apply(xret, CX_ELMNT, (xml_applyfn_t*) xml_flag_default_value, (void*) XML_FLAG_MARK) < 0)
if (xml_apply(xret, CX_ELMNT, (xml_applyfn_t*) xml_add_default_tag, (void*) (XML_FLAG_DEFAULT | XML_FLAG_MARK)) < 0) goto done;
goto done; /* Add tag attributes to default nodes */
if (xml_apply(xret, CX_ELMNT, (xml_applyfn_t*) xml_add_default_tag, (void*) (XML_FLAG_DEFAULT | XML_FLAG_MARK)) < 0)
} else if (strcmp(mode, "report-all") == 0) { goto done;
/* Accept mode, do nothing */ goto ok;
} }
if (strcmp(mode, "report-all") == 0) {
/* Accept mode, do nothing */
goto ok;
} }
} }
ok:
retval = 0; retval = 0;
done: done:
return retval; return retval;
} }