diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 17:45:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-09 17:45:21 +0200 |
| commit | 809f0a16e75bf7679a4919c642699a7bb3039ae3 (patch) | |
| tree | 5669c84e04fe8e6a605d11b9d50634ff8ce9c266 /runtime/msg.h | |
| parent | cafb951020817cca6b89b5cc6b91f3a8ab86f29a (diff) | |
| parent | 4130ca8670b37d0fe92a1abb47a2840c62604ded (diff) | |
| download | rsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.tar.gz rsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.tar.xz rsyslog-809f0a16e75bf7679a4919c642699a7bb3039ae3.zip | |
Merge branch 'master' into udpspoof & cleanup & slight optimization
Conflicts:
runtime/msg.c
I messed up and did some changes during the merge commit ;) But these are
not large, just a little bit of cleanup and some very slight optimizations
inside the msg object.
Diffstat (limited to 'runtime/msg.h')
| -rw-r--r-- | runtime/msg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/msg.h b/runtime/msg.h index c20fb005..98b3599a 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); @@ -176,7 +176,7 @@ int getMSGLen(msg_t *pM); char *getHOSTNAME(msg_t *pM); int getHOSTNAMELen(msg_t *pM); -char *getProgramName(msg_t *pM, bool bLockMutex); +uchar *getProgramName(msg_t *pM, bool bLockMutex); int getProgramNameLen(msg_t *pM, bool bLockMutex); uchar *getRcvFrom(msg_t *pM); rsRetVal propNameToID(cstr_t *pCSPropName, propid_t *pPropID); |