diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
commit | 0fa5486a4ace7a9be82b37979cf4693aff237340 (patch) | |
tree | 6c1b10bca2629acc171c1bb8719ef9fe6202a5c0 /plugins/imfile/imfile.c | |
parent | 737614054caadf8340b638b368d43f55b7bb3741 (diff) | |
parent | aba90e82484118f3568ec51c01de5ba845da589a (diff) | |
download | rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.gz rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.bz2 rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.zip |
Merge branch 'master' into ultra-reliable
Conflicts:
runtime/rsyslog.h
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'plugins/imfile/imfile.c')
-rw-r--r-- | plugins/imfile/imfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index b0211bf6..92fd30c3 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -45,6 +45,7 @@ #include "errmsg.h" #include "glbl.h" #include "datetime.h" +#include "unicode-helper.h" MODULE_TYPE_INPUT /* must be present for input modules, do not remove */ @@ -94,11 +95,11 @@ static rsRetVal enqLine(fileInfo_t *pInfo, cstr_t *cstrLine) CHKiRet(msgConstruct(&pMsg)); MsgSetFlowControlType(pMsg, eFLOWCTL_FULL_DELAY); - MsgSetInputName(pMsg, "imfile"); + MsgSetInputName(pMsg, UCHAR_CONSTANT("imfile")); MsgSetUxTradMsg(pMsg, (char*)rsCStrGetSzStr(cstrLine)); MsgSetRawMsg(pMsg, (char*)rsCStrGetSzStr(cstrLine)); MsgSetMSG(pMsg, (char*)rsCStrGetSzStr(cstrLine)); - MsgSetHOSTNAME(pMsg, (char*)glbl.GetLocalHostName()); + MsgSetHOSTNAME(pMsg, glbl.GetLocalHostName()); MsgSetTAG(pMsg, (char*)pInfo->pszTag); pMsg->iFacility = LOG_FAC(pInfo->iFacility); pMsg->iSeverity = LOG_PRI(pInfo->iSeverity); |