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

C-API: changed singature to yang_mount_set(y), rm: yang_mount_yspec2ymnt

Browse source
This commit is contained in:
Olof hagsand 2024-11-14 11:25:24 +01:00
parent ca695ea386
commit 27c821e3ce
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/backend/backend_socket.c
View file

@ -178,7 +178,7 @@ config_socket_init_unix(clixon_handle h,
clixon_err(OE_UNIX, errno, "lchown(%s, %s)", sock, config_group); clixon_err(OE_UNIX, errno, "lchown(%s, %s)", sock, config_group);
goto err; goto err;
} }
clixon_debug(CLIXON_DBG_BACKEND, "Listen on server socket at %s", addr.sun_path); clixon_debug(CLIXON_DBG_INIT, "Listen on server socket at %s", addr.sun_path);
if (listen(s, 5) < 0){ if (listen(s, 5) < 0){
clixon_err(OE_UNIX, errno, "listen"); clixon_err(OE_UNIX, errno, "listen");
goto err; goto err;

3
lib/clixon/clixon_yang_schema_mount.h
View file

@ -58,11 +58,10 @@ int yang_schema_mount_point0(yang_stmt *y);
int yang_schema_mount_point(yang_stmt *y); int yang_schema_mount_point(yang_stmt *y);
int yang_mount_get(yang_stmt *yu, char *xpath, yang_stmt **yspec); int yang_mount_get(yang_stmt *yu, char *xpath, yang_stmt **yspec);
int yang_mount_get_yspec_any(yang_stmt *y, yang_stmt **yspec); int yang_mount_get_yspec_any(yang_stmt *y, yang_stmt **yspec);
int yang_mount_set(yang_stmt *yu, char *xpath, yang_stmt *yspec); int yang_mount_set(yang_stmt *yu);
int xml_yang_mount_get(clixon_handle h, cxobj *x, validate_level *vl, char **xpathp, yang_stmt **yspec); int xml_yang_mount_get(clixon_handle h, cxobj *x, validate_level *vl, char **xpathp, yang_stmt **yspec);
int xml_yang_mount_set(clixon_handle h, cxobj *x, yang_stmt *yspec); int xml_yang_mount_set(clixon_handle h, cxobj *x, yang_stmt *yspec);
int yang_mount_xtop2xmnt(cxobj *xtop, cvec **cvvp); int yang_mount_xtop2xmnt(cxobj *xtop, cvec **cvvp);
int yang_mount_yspec2ymnt(yang_stmt *yspec, cvec **cvvp);
int yang_schema_mount_statedata(clixon_handle h, yang_stmt *yspec, char *xpath, cvec *nsc, cxobj **xret, cxobj **xerr); int yang_schema_mount_statedata(clixon_handle h, yang_stmt *yspec, char *xpath, cvec *nsc, cxobj **xret, cxobj **xerr);
int yang_schema_yanglib_parse_mount(clixon_handle h, cxobj *xt); int yang_schema_yanglib_parse_mount(clixon_handle h, cxobj *xt);
int yang_schema_get_child(clixon_handle h, cxobj *x1, cxobj *x1c, yang_stmt **yc); int yang_schema_get_child(clixon_handle h, cxobj *x1, cxobj *x1c, yang_stmt **yc);

18
lib/src/clixon_yang_schema_mount.c
View file

@ -64,15 +64,14 @@
* The calls in this code are: * The calls in this code are:
* - yang_schema_mount_point(): Is ymnt a yang mount-point? (ymnt) * - yang_schema_mount_point(): Is ymnt a yang mount-point? (ymnt)
* - yang_mount_get(): ymnt + xpath -> yspec * - yang_mount_get(): ymnt + xpath -> yspec
* - yang_mount_get2(): ymnt + xpath -> yspec # NEW * - yang_mount_set(): ymnt
* - yang_mount_set(): ymnt + xpath -> yspec
* - xml_yang_mount_get(): xmnt-> yspec * - xml_yang_mount_get(): xmnt-> yspec
* - xml_yang_mount_set(): xmnt -> yspec * - xml_yang_mount_set(): xmnt -> yspec
* - yang_mount_get_yspec_any(): ymnt -> yspec * - yang_mount_get_yspec_any(): ymnt -> yspec
* - yang_mounto_freeall(): ymnt-> free cvec * - yang_mounto_freeall(): ymnt-> free cvec
* - yang_mount_xmnt2ymnt_xpath(): xmnt -> ymnt + xpath * - yang_mount_xmnt2ymnt_xpath(): xmnt -> ymnt + xpath
* - yang_mount_xtop2xmnt(): top-level xml -> xmnt vector * - yang_mount_xtop2xmnt(): top-level xml -> xmnt vector
* - yang_mount_yspec2ymnt(): top-level yspec -> ymnt vector * - yang_mount_yspec2ymnt(): top-level yspec -> ymnt vector NOTUSED
* - yang_schema_mount_statistics(): Given xtop -> find all xmnt -> stats * - yang_schema_mount_statistics(): Given xtop -> find all xmnt -> stats
* *
@ -264,15 +263,10 @@ yang_mount_get_yspec_any(yang_stmt *ys,
* @retval -1 Error * @retval -1 Error
*/ */
int int
yang_mount_set(yang_stmt *y, yang_mount_set(yang_stmt *y)
char *xpath,
yang_stmt *yspec)
{ {
int retval = -1;
yang_flag_set(y, YANG_FLAG_MOUNTPOINT); /* Cache value */ yang_flag_set(y, YANG_FLAG_MOUNTPOINT); /* Cache value */
retval = 0; return 0;
return retval;
} }
/*! Given an XML mount-point return YANG mount and XPath /*! Given an XML mount-point return YANG mount and XPath
@ -406,7 +400,7 @@ xml_yang_mount_set(clixon_handle h,
clixon_err(OE_YANG, 0, "Mapping xmnt to ymnt and xpath"); clixon_err(OE_YANG, 0, "Mapping xmnt to ymnt and xpath");
goto done; goto done;
} }
if (yang_mount_set(ymnt, xpath, yspec) < 0) if (yang_mount_set(ymnt) < 0)
goto done; goto done;
retval = 0; retval = 0;
done: done:
@ -477,6 +471,7 @@ yang_mount_xtop2xmnt(cxobj *xtop,
return retval; return retval;
} }
#ifdef NOTUSED
/*! Find schema mounts - callback function for yang_apply /*! Find schema mounts - callback function for yang_apply
* *
* @param[in] yn yang node * @param[in] yn yang node
@ -534,6 +529,7 @@ yang_mount_yspec2ymnt(yang_stmt *yspec,
done: done:
return retval; return retval;
} }
#endif
/*! Find mount-points and return yang-library state /*! Find mount-points and return yang-library state
* *