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

im3195: fix compile issues on modern compilers

Browse Source 
... namely gcc 7 and clang 5. We do the most minimal change to
get to a clean build as this module AFAIK is not used by anyone
for quite some years now (RFC3195 is a total failure).

closes https://github.com/rsyslog/rsyslog/issues/2094
This commit is contained in:
Rainer Gerhards 2018-01-05 17:49:55 +01:00
parent ad01356292
commit 09aaf0a1d5
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/im3195/im3195.c
View File

@ -15,7 +15,7 @@
*
* \author Rainer Gerhards <rgerhards@adiscon.com>
*
* Copyright (C) 2003-2012 Adiscon GmbH.
* Copyright (C) 2003-2018 Adiscon GmbH.
*
* This file is part of rsyslog.
*
@ -52,7 +52,6 @@
MODULE_TYPE_INPUT
MODULE_TYPE_NOKEEP
MODULE_CNFNAME("im3195")
/* Module static data */
DEF_IMOD_STATIC_DATA
@ -86,7 +85,8 @@ static prop_t *pInputName = NULL;
* best solution, but real-world experience might tell us a
* different truth ;)
*/
void OnReceive(srAPIObj __attribute__((unused)) *pMyAPI, srSLMGObj* pSLMG)
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
static void OnReceive(srAPIObj __attribute__((unused)) *pMyAPI, srSLMGObj* pSLMG)
{
uchar *pszRawMsg;
uchar *fromHost = (uchar*) "[unset]"; /* TODO: get hostname */
@ -136,7 +136,7 @@ CODESTARTrunInput
/* now move the listener to running state. Control will only
* return after SIGUSR1.
*/
if((iRet = srAPIRunListener(pAPI)) != SR_RET_OK) {
if((iRet = (rsRetVal) srAPIRunListener(pAPI)) != RS_RET_OK) {
errmsg.LogError(0, NO_ERRCODE, "error %d running liblogging listener - im3195 "
"is defunct", iRet);
FINALIZE; /* this causes im3195 to become defunct; TODO: recovery handling */
@ -153,12 +153,12 @@ CODESTARTwillRun
ABORT_FINALIZE(RS_RET_ERR);
}
if((iRet = srAPISetOption(pAPI, srOPTION_BEEP_LISTENPORT, listenPort)) != SR_RET_OK) {
if((iRet = (rsRetVal) srAPISetOption(pAPI, srOPTION_BEEP_LISTENPORT, listenPort)) != RS_RET_OK) {
errmsg.LogError(0, NO_ERRCODE, "error %d setting liblogging listen port - im3195 is defunct", iRet);
FINALIZE;
}
if((iRet = srAPISetupListener(pAPI, OnReceive)) != SR_RET_OK) {
if((iRet = (rsRetVal) srAPISetupListener(pAPI, OnReceive)) != RS_RET_OK) {
errmsg.LogError(0, NO_ERRCODE, "error %d setting up liblogging listener - im3195 is defunct", iRet);
FINALIZE;
}
@ -215,5 +215,3 @@ CODEmodInit_QueryRegCFSLineHdlr
CHKiRet(prop.ConstructFinalize(pInputName));
ENDmodInit
/* vim:set ai:
*/