summaryrefslogtreecommitdiffstats
path: root/omfwd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-07-26 09:31:50 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-07-26 09:31:50 +0000
commit1b1229cd1e76ee43b8fb75466dd80a2c72b54136 (patch)
tree3af783f24c4ad2272ba06656d8b02d7a0fa9f124 /omfwd.c
parentb0f7302011f1bcc298c7a78ed3bb3f500893e70a (diff)
downloadrsyslog-1b1229cd1e76ee43b8fb75466dd80a2c72b54136.tar.gz
rsyslog-1b1229cd1e76ee43b8fb75466dd80a2c72b54136.tar.xz
rsyslog-1b1229cd1e76ee43b8fb75466dd80a2c72b54136.zip
- changed doAction() interface to include module data pointer
- removed references to f_un from omusrmsg.c - changed module template for parseSelectorAct() [code reduction, consitency]
Diffstat (limited to 'omfwd.c')
-rw-r--r--omfwd.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/omfwd.c b/omfwd.c
index 81aa5424..4e317f31 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -670,7 +670,7 @@ ENDdoAction
BEGINparseSelectorAct
- uchar *p, *q;
+ uchar *q;
int i;
int error;
int bErr;
@@ -680,7 +680,7 @@ CODESTARTparseSelectorAct
p = *pp;
if(*p == '@') {
- if((iRet = createInstance(&pModData)) != RS_RET_OK)
+ if((iRet = createInstance(&pData)) != RS_RET_OK)
return iRet;
++p; /* eat '@' */
if(*p == '@') { /* indicator for TCP! */
@@ -838,10 +838,6 @@ CODESTARTparseSelectorAct
iRet = RS_RET_CONFLINE_UNPROCESSED;
}
- if(iRet == RS_RET_OK) {
- *ppModData = pModData;
- *pp = p;
- }
/* TODO: do we need to call freeInstance if we failed - this is a general question for
* all output modules. I'll address it lates as the interface evolves. rgerhards, 2007-07-25
*/