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

modified CHANGELOG for 5.0, improved some logs

Browse source
This commit is contained in:
Olof hagsand 2021-02-25 21:58:57 +01:00
parent e1e391ad0d
commit 84ac4a1e49
6 changed files with 70 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/src/clixon_sig.c
View file

@ -69,7 +69,7 @@ set_signal(int signo,
snew.sa_handler = handler;
sigemptyset(&snew.sa_mask);
snew.sa_flags = 0;
if (sigaction (signo, &snew, &sold) < 0){
if (sigaction(signo, &snew, &sold) < 0){
clicon_err(OE_UNIX, errno, "sigaction");
return -1;
}
@ -86,36 +86,36 @@ set_signal(int signo,
* @param[in] sig Signal number to block, If 0, block all signals
*/
void
clicon_signal_block (int sig)
clicon_signal_block(int sig)
{
sigset_t
set;
sigemptyset (&set);
sigemptyset(&set);
if (sig)
sigaddset (&set, sig);
sigaddset(&set, sig);
else
sigfillset (&set);
sigfillset(&set);
sigprocmask (SIG_BLOCK, &set, NULL);
sigprocmask(SIG_BLOCK, &set, NULL);
}
/*! Unblock signal.
* @param[in] sig Signal number to unblock. If 0, unblock all signals
*/
void
clicon_signal_unblock (int sig)
clicon_signal_unblock(int sig)
{
sigset_t
set;
sigemptyset (&set);
sigemptyset(&set);
if (sig)
sigaddset (&set, sig);
sigaddset(&set, sig);
else
sigfillset (&set);
sigfillset(&set);
sigprocmask (SIG_UNBLOCK, &set, NULL);
sigprocmask(SIG_UNBLOCK, &set, NULL);
}
/*! Read pidfile and return pid using file descriptor

2
lib/src/clixon_xml.c
View file

@ -1518,7 +1518,7 @@ xml_rootchild(cxobj *xp,
goto done;
}
if ((xc = xml_child_i(xp, i)) == NULL){
clicon_err(OE_XML, 0, "Child not found");
clicon_err(OE_XML, ENOENT, "Child %d of parent %s not found", i, xml_name(xp));
goto done;
}
if (xml_child_rm(xp, i) < 0)