rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 11:40:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

do not shadow global symbol

Browse Source
This commit is contained in:
Rainer Gerhards 2016-01-13 06:12:09 -05:30
parent 92c5d43969
commit 421ddd602e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/omprog/omprog.c
View File

@ -595,24 +595,23 @@ CODESTARTnewActInst
} else if(!strcmp(actpblk.descr[i].name, "forcesingleinstance")) {
pData->bForceSingleInst = (int) pvals[i].val.d.n;
} else if(!strcmp(actpblk.descr[i].name, "hup.signal")) {
const char *const signal = es_str2cstr(pvals[i].val.d.estr, NULL);
if(!strcmp(signal, "HUP"))
const char *const sig = es_str2cstr(pvals[i].val.d.estr, NULL);
if(!strcmp(sig, "HUP"))
pData->iHUPForward = SIGHUP;
else if(!strcmp(signal, "USR1"))
else if(!strcmp(sig, "USR1"))
pData->iHUPForward = SIGUSR1;
else if(!strcmp(signal, "USR2"))
else if(!strcmp(sig, "USR2"))
pData->iHUPForward = SIGUSR2;
else if(!strcmp(signal, "INT"))
else if(!strcmp(sig, "INT"))
pData->iHUPForward = SIGINT;
else if(!strcmp(signal, "TERM"))
else if(!strcmp(sig, "TERM"))
pData->iHUPForward = SIGTERM;
else {
errmsg.LogError(0, RS_RET_CONF_PARAM_INVLD,
"omprog: hup.signal '%s' in hup.signal parameter",
signal);
"omprog: hup.signal '%s' in hup.signal parameter", sig);
ABORT_FINALIZE(RS_RET_CONF_PARAM_INVLD);
}
free((void*)signal);
free((void*)sig);
} else if(!strcmp(actpblk.descr[i].name, "template")) {
pData->tplName = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
} else {