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

moved config yang spec from main functions to options_main function

Browse source
This commit is contained in:
Olof hagsand 2019-12-01 17:42:34 +01:00
parent c4954f5c43
commit 08b128f4d7
6 changed files with 18 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/restconf/restconf_main.c
View file

@ -582,7 +582,6 @@ main(int argc,
char *dir;
int logdst = CLICON_LOG_SYSLOG;
yang_stmt *yspec = NULL;
yang_stmt *yspecfg = NULL; /* For config XXX clixon bug */
char *stream_path;
int finish = 0;
int start = 1;
@ -642,13 +641,8 @@ main(int argc,
goto done;
}
/* Create configure yang-spec note different from dbspec holding application specs) */
if ((yspecfg = yspec_new()) == NULL)
goto done;
/* Find and read configfile */
if (clicon_options_main(h, yspecfg) < 0)
goto done;
if (clicon_config_yang_set(h, yspecfg) < 0)
if (clicon_options_main(h) < 0)
goto done;
stream_path = clicon_option_str(h, "CLICON_STREAM_PATH");