summaryrefslogtreecommitdiffstats
path: root/runtime/msg.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-09 17:21:01 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-09 17:21:01 +0200
commit4130ca8670b37d0fe92a1abb47a2840c62604ded (patch)
treee6370bf013f0026d3b3ad726b37776753902c662 /runtime/msg.h
parent9f286c0c4c21128c66305166ae379d3f7b07f673 (diff)
parent6fde78cb744b22eb5790d43297acab249ca0e7fa (diff)
downloadrsyslog-4130ca8670b37d0fe92a1abb47a2840c62604ded.tar.gz
rsyslog-4130ca8670b37d0fe92a1abb47a2840c62604ded.tar.xz
rsyslog-4130ca8670b37d0fe92a1abb47a2840c62604ded.zip
Merge branch 'v4-devel'
Diffstat (limited to 'runtime/msg.h')
-rw-r--r--runtime/msg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/msg.h b/runtime/msg.h
index c20fb005..0b346f7b 100644
--- a/runtime/msg.h
+++ b/runtime/msg.h
@@ -159,7 +159,7 @@ void MsgSetMSGoffs(msg_t *pMsg, short offs);
void MsgSetRawMsgWOSize(msg_t *pMsg, char* pszRawMsg);
void MsgSetRawMsg(msg_t *pMsg, char* pszRawMsg, size_t lenMsg);
rsRetVal MsgReplaceMSG(msg_t *pThis, uchar* pszMSG, int lenMSG);
-char *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
+uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
propid_t propID, size_t *pPropLen, unsigned short *pbMustBeFreed);
char *textpri(char *pRes, size_t pResLen, int pri);
rsRetVal msgGetMsgVar(msg_t *pThis, cstr_t *pstrPropName, var_t **ppVar);
@@ -168,7 +168,7 @@ uchar *getRcvFrom(msg_t *pM);
/* TODO: remove these five (so far used in action.c) */
-char *getMSG(msg_t *pM);
+uchar *getMSG(msg_t *pM);
char *getHOSTNAME(msg_t *pM);
char *getPROCID(msg_t *pM, bool bLockMutex);
char *getAPPNAME(msg_t *pM, bool bLockMutex);