diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:37:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:37:59 +0200 |
| commit | 596383988792635f128cb645c9b7c8aae50453e6 (patch) | |
| tree | 5e5ba6dc03b6e9b687b09f49828b5a1fcdda1cda /runtime/msg.h | |
| parent | 8624f937523c1ca78cc1d78b8eba18f628ae9ab5 (diff) | |
| parent | daa76ad94428599336ddafdd6854dc0b71356180 (diff) | |
| download | rsyslog-596383988792635f128cb645c9b7c8aae50453e6.tar.gz rsyslog-596383988792635f128cb645c9b7c8aae50453e6.tar.xz rsyslog-596383988792635f128cb645c9b7c8aae50453e6.zip | |
Merge branch 'v4-devel' into v4-beta
Diffstat (limited to 'runtime/msg.h')
| -rw-r--r-- | runtime/msg.h | 4 |
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); |