Merge branch 'master' of https://github.com/dcornejo/clixon into dcornejo-master

This commit is contained in:
Olof hagsand 2019-03-06 10:03:58 +01:00
commit 77387e9c65
4 changed files with 3 additions and 3 deletions

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

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;
} }

View file

@ -49,8 +49,6 @@
/* /*
* Types * Types
*/ */
/* Dynamicically loadable plugin object handle. @see return value of dlopen(3) */
typedef void *plghndl_t;
/*! Registered RPC callback function /*! Registered RPC callback function
* @param[in] h Clicon handle * @param[in] h Clicon handle

View file

@ -68,6 +68,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>