summaryrefslogtreecommitdiffstats
path: root/omfile.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 /omfile.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 'omfile.c')
-rw-r--r--omfile.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/omfile.c b/omfile.c
index ebd91fa1..a2e4dcf6 100644
--- a/omfile.c
+++ b/omfile.c
@@ -568,7 +568,6 @@ ENDdoAction
BEGINparseSelectorAct
- uchar *p;
int syncfile;
CODESTARTparseSelectorAct
p = *pp;
@@ -585,7 +584,7 @@ CODESTARTparseSelectorAct
* the code further changes. -- rgerhards, 2007-07-25
*/
if(*p == '$' || *p == '?' || *p == '|' || *p == '/') {
- if((iRet = createInstance(&pModData)) != RS_RET_OK)
+ if((iRet = createInstance(&pData)) != RS_RET_OK)
return iRet;
}
@@ -683,11 +682,6 @@ CODESTARTparseSelectorAct
iRet = RS_RET_CONFLINE_UNPROCESSED;
break;
}
-
- if(iRet == RS_RET_OK) {
- *ppModData = (void*) pModData;
- *pp = p;
- }
ENDparseSelectorAct