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

Merge branch 'develop' of https://github.com/clicon/clixon into develop

Browse source
This commit is contained in:
Olof hagsand 2018-10-12 18:42:03 +02:00
commit dcec834455
7 changed files with 48 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/clixon/clixon_yang.h
View file

@ -260,6 +260,7 @@ char *yang_find_myprefix(yang_stmt *ys);
int yang_order(yang_stmt *y);
int yang_print(FILE *f, yang_node *yn);
int yang_print_cbuf(cbuf *cb, yang_node *yn, int marginal);
int ys_populate(yang_stmt *ys, void *arg);
yang_stmt *yang_parse_file(int fd, const char *name, yang_spec *ysp);
int yang_parse(clicon_handle h, const char *filename,
const char *module, const char *dir,

3
lib/src/clixon_stream.c
View file

@ -203,6 +203,7 @@ stream_cb_add(clicon_handle h,
event_stream_t *es;
struct stream_subscription *ss;
clicon_debug(1, "%s", __FUNCTION__);
if ((es = stream_find(h, stream)) == NULL){
clicon_err(OE_CFG, ENOENT, "Stream %s not found", stream);
goto done;
@ -289,6 +290,7 @@ stream_notify_xml(clicon_handle h,
event_stream_t *es;
struct stream_subscription *ss;
clicon_debug(1, "%s", __FUNCTION__);
if ((es = stream_find(h, stream)) == NULL)
goto ok;
/* Go thru all global (handle) subscriptions and find matches */
@ -332,6 +334,7 @@ stream_notify(clicon_handle h,
char timestr[27];
struct timeval tv;
clicon_debug(1, "%s", __FUNCTION__);
va_start(args, event);
len = vsnprintf(NULL, 0, event, args) + 1;
va_end(args);

2
lib/src/clixon_yang.c
View file

@ -1435,7 +1435,7 @@ ys_populate_feature(clicon_handle h,
* See ys_parse_sub for first pass and what can be assumed
* After this pass, cv:s are set for LEAFs and LEAF-LISTs
*/
static int
int
ys_populate(yang_stmt *ys,
void *arg)
{