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

FreeBSD compatibility & pedanticism patches

Browse source 
use ETIMEDOUT rather than ETIME - this seems more the intent of its
usage here and it compiles under FreeBSD & Linux.
in yang_spec_parse_file() the function basename() is not declared,
the declaration is in libgen.h, so include it. also basename() takes
char * for its argument not const char *, yang_spec_parse_file()
has to be changed to char *filename to compile w/o warnings
This commit is contained in:
Dave Cornejo 2019-02-22 19:57:42 -10:00
parent 7590395fe3
commit e282493095
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
*.o *.o
*.so.* *.so.*
*.so
*_parse.tab.c *_parse.tab.c
*_parse.tab.h *_parse.tab.h
lex.*_parse.c lex.*_parse.c

2
apps/netconf/netconf_main.c
View file

@ -312,7 +312,7 @@ static int
timeout_fn(int s, timeout_fn(int s,
void *arg) void *arg)
{ {
clicon_err(OE_EVENTS, ETIME, "User request timeout"); clicon_err(OE_EVENTS, ETIMEDOUT, "User request timeout");
return -1; return -1;
} }

2
lib/clixon/clixon_yang.h
View file

@ -281,7 +281,7 @@ int yang_mandatory(yang_stmt *ys);
int yang_config(yang_stmt *ys); int yang_config(yang_stmt *ys);
int yang_spec_parse_module(clicon_handle h, const char *module, int yang_spec_parse_module(clicon_handle h, const char *module,
const char *revision, yang_spec *yspec); const char *revision, yang_spec *yspec);
int yang_spec_parse_file(clicon_handle h, const char *filename, yang_spec *yspec); int yang_spec_parse_file(clicon_handle h, char *filename, yang_spec *yspec);
int yang_spec_load_dir(clicon_handle h, char *dir, yang_spec *yspec); int yang_spec_load_dir(clicon_handle h, char *dir, yang_spec *yspec);
cvec *yang_arg2cvec(yang_stmt *ys, char *delimi); cvec *yang_arg2cvec(yang_stmt *ys, char *delimi);
int yang_key_match(yang_node *yn, char *name); int yang_key_match(yang_node *yn, char *name);

3
lib/src/clixon_yang.c
View file

@ -69,6 +69,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <libgen.h>
/* cligen */ /* cligen */
#include <cligen/cligen.h> #include <cligen/cligen.h>
@ -2449,7 +2450,7 @@ yang_spec_parse_module(clicon_handle h,
*/ */
int int
yang_spec_parse_file(clicon_handle h, yang_spec_parse_file(clicon_handle h,
const char *filename, char *filename,
yang_spec *yspec) yang_spec *yspec)
{ {
int retval = -1; int retval = -1;