diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-28 16:23:18 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-28 16:23:18 +0100 |
| commit | c0f92325c634fd3d0482f5d8bdc6650ab725cce1 (patch) | |
| tree | 87073391e08087a17d2088b14523cdb63e57b524 /tools/iminternal.c | |
| parent | bf088c5c2ed06db1c765a96df3762a00ae44db9c (diff) | |
| parent | 74a71e798efd58e20cc150b04de2613bf518eed4 (diff) | |
| download | rsyslog-c0f92325c634fd3d0482f5d8bdc6650ab725cce1.tar.gz rsyslog-c0f92325c634fd3d0482f5d8bdc6650ab725cce1.tar.xz rsyslog-c0f92325c634fd3d0482f5d8bdc6650ab725cce1.zip | |
Merge branch 'master' into master-tcpsrv-mt
Diffstat (limited to 'tools/iminternal.c')
| -rw-r--r-- | tools/iminternal.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/iminternal.c b/tools/iminternal.c index bd1fa128..167e2b29 100644 --- a/tools/iminternal.c +++ b/tools/iminternal.c @@ -89,7 +89,7 @@ finalize_it: * The interface of this function is modelled after syslogd/logmsg(), * for which it is an "replacement". */ -rsRetVal iminternalAddMsg(int pri, msg_t *pMsg) +rsRetVal iminternalAddMsg(msg_t *pMsg) { DEFiRet; iminternal_t *pThis; @@ -98,7 +98,6 @@ rsRetVal iminternalAddMsg(int pri, msg_t *pMsg) CHKiRet(iminternalConstruct(&pThis)); - pThis->pri = pri; pThis->pMsg = pMsg; CHKiRet(llAppend(&llMsgs, NULL, (void*) pThis)); @@ -118,17 +117,15 @@ finalize_it: * from the list and return it to the caller. The caller is * responsible for freeing the message! */ -rsRetVal iminternalRemoveMsg(int *pPri, msg_t **ppMsg) +rsRetVal iminternalRemoveMsg(msg_t **ppMsg) { DEFiRet; iminternal_t *pThis; linkedListCookie_t llCookie = NULL; - assert(pPri != NULL); assert(ppMsg != NULL); CHKiRet(llGetNextElt(&llMsgs, &llCookie, (void*)&pThis)); - *pPri = pThis->pri; *ppMsg = pThis->pMsg; pThis->pMsg = NULL; /* we do no longer own it - important for destructor */ |