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

Break out init of orig-ptr to yang_start() to be made after options

Browse source
This commit is contained in:
Olof hagsand 2024-09-28 18:04:04 +02:00
parent ba40f5a929
commit 43bfc82942
8 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/src/clixon_client.c
View file

@ -132,6 +132,7 @@ clixon_client_init(const char *config_file)
/* Find, read and parse configfile */
if (clicon_options_main(h) < 0)
return NULL;
yang_start(h);
return h;
}

18
lib/src/clixon_yang.c
View file

@ -4456,7 +4456,7 @@ yang_action_cb_add(yang_stmt *ys,
return 0;
}
/*! Init yang code
/*! Init yang code. Called before any yang code, before options
*
* Add two external tables for YANGs
* @param[in] h Clixon handle
@ -4470,7 +4470,6 @@ yang_init(clixon_handle h)
map_ptr2ptr *mp;
yang_stmt *ymounts;
_yang_use_orig = clicon_option_bool(h, "CLICON_YANG_USE_ORIGINAL");
if ((mp = calloc(1, sizeof(*mp))) == NULL){
clixon_err(OE_UNIX, errno, "calloc");
goto done;
@ -4492,6 +4491,21 @@ yang_init(clixon_handle h)
return retval;
}
/*! Start yang code. Called after yang options loaded
*
* Called after YANG config and -o options and plugins init
* But before YANG data loaded
* Set local CLICON_YANG_USE_ORIGINAL variable
* @param[in] h Clixon handle
* @retval 0 OK
*/
int
yang_start(clixon_handle h)
{
_yang_use_orig = clicon_option_bool(h, "CLICON_YANG_USE_ORIGINAL");
return 0;
}
/*! Exit yang code
*
* @param[in] h Clixon handle