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

This commit is contained in:
Olof hagsand 2018-07-20 10:54:07 +02:00
commit 912d1df853
3 changed files with 3 additions and 3 deletions

View file

@ -162,7 +162,7 @@ ctx_print(cbuf *cb,
int int
ctx2boolean(xp_ctx *xc) ctx2boolean(xp_ctx *xc)
{ {
int b; int b = -1;
switch (xc->xc_type){ switch (xc->xc_type){
case XT_NODESET: case XT_NODESET:
b = (xc->xc_size != 0); b = (xc->xc_size != 0);

View file

@ -61,7 +61,7 @@ LIBS = @LIBS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
INCLUDES = -I. @INCLUDES@ -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir) INCLUDES = -I. @INCLUDES@ -I$(top_srcdir)/lib -I$(top_srcdir)/include
MYLIB = ../lib/src/libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR) MYLIB = ../lib/src/libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)

View file

@ -128,7 +128,7 @@ main(int argc, char **argv)
char *xpath0 = NULL; char *xpath0 = NULL;
char *filename; char *filename;
xp_ctx *xc = NULL; xp_ctx *xc = NULL;
cbuf *cb; cbuf *cb = NULL;
clicon_log_init("xpath", LOG_DEBUG, CLICON_LOG_STDERR); clicon_log_init("xpath", LOG_DEBUG, CLICON_LOG_STDERR);
optind = 1; optind = 1;