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

* Rename demon -> daemon

Browse source
This commit is contained in:
Olof hagsand 2022-03-07 11:17:34 +01:00
parent dd2ac56af8
commit ff37ce808c
7 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/clixon_err.c
View file

@ -114,7 +114,7 @@ static struct errvec EV[] = {
{"Regexp error", OE_REGEX},
{"UNIX error", OE_UNIX},
{"Syslog error", OE_SYSLOG},
{"Routing demon error", OE_ROUTING},
{"Routing daemon error", OE_ROUTING},
{"XML error", OE_XML},
{"JSON error", OE_JSON},
{"RESTCONF error", OE_RESTCONF},

4
lib/src/clixon_event.c
View file

@ -186,7 +186,7 @@ clixon_event_reg_fd(int fd,
return -1;
}
memset(e, 0, sizeof(struct event_data));
strncpy(e->e_string, str, EVENT_STRLEN);
strncpy(e->e_string, str, EVENT_STRLEN-1);
e->e_fd = fd;
e->e_fn = fn;
e->e_arg = arg;
@ -261,7 +261,7 @@ clixon_event_reg_timeout(struct timeval t,
return -1;
}
memset(e, 0, sizeof(struct event_data));
strncpy(e->e_string, str, EVENT_STRLEN);
strncpy(e->e_string, str, EVENT_STRLEN-1);
e->e_fn = fn;
e->e_arg = arg;
e->e_type = EVENT_TIME;

6
lib/src/clixon_proto_client.c
View file

@ -862,10 +862,8 @@ clicon_rpc_get(clicon_handle h,
". Internal error, backend returned invalid XML.",
NULL) < 0)
goto done;
if ((xd = xpath_first(xerr, NULL, "rpc-error")) == NULL){
clicon_err(OE_XML, ENOENT, "Expected rpc-error tag but none found(internal)");
goto done;
}
xd = xerr;
xerr = NULL;
}
}
if (xt && xd){

2
lib/src/clixon_sig.c
View file

@ -243,7 +243,7 @@ pidfile_zapold(pid_t pid)
}
if ((kill(pid, 0)) < 0){
if (errno != ESRCH){
clicon_err(OE_DAEMON, errno, "Killing old demon");
clicon_err(OE_DAEMON, errno, "Killing old daemon");
goto done;
}
}