diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 14:16:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 14:16:57 +0100 |
| commit | ad0fa5175901ba101a1e06f4a39ae56b75f84dca (patch) | |
| tree | b25b46993ddc5339f5ff39da7a219f664f05deac /runtime/modules.c | |
| parent | 6624ad434b5e346a84f600845c09739208382f43 (diff) | |
| parent | 1049537cd853c9714c4bdc3fe4296dda8507900d (diff) | |
| download | rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.gz rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.tar.bz2 rsyslog-ad0fa5175901ba101a1e06f4a39ae56b75f84dca.zip | |
Merge branch 'v6-stable'
Conflicts:
runtime/conf.c
runtime/modules.c
runtime/modules.h
Diffstat (limited to 'runtime/modules.c')
| -rw-r--r-- | runtime/modules.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/runtime/modules.c b/runtime/modules.c index e5475780..5a87c8be 100644 --- a/runtime/modules.c +++ b/runtime/modules.c @@ -599,8 +599,6 @@ doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_ CHKiRet((*pNew->modQueryEtryPt)((uchar*)"doAction", &pNew->mod.om.doAction)); CHKiRet((*pNew->modQueryEtryPt)((uchar*)"parseSelectorAct", &pNew->mod.om.parseSelectorAct)); CHKiRet((*pNew->modQueryEtryPt)((uchar*)"tryResume", &pNew->tryResume)); - CHKiRet((*pNew->modQueryEtryPt)((uchar*)"newScope", &pNew->mod.om.newScope)); - CHKiRet((*pNew->modQueryEtryPt)((uchar*)"restoreScope", &pNew->mod.om.restoreScope)); /* try load optional interfaces */ localRet = (*pNew->modQueryEtryPt)((uchar*)"doHUP", &pNew->doHUP); if(localRet != RS_RET_OK && localRet != RS_RET_MODULE_ENTRY_POINT_NOT_FOUND) @@ -777,8 +775,6 @@ static void modPrintList(void) NULL : pMod->mod.om.newActInst); dbgprintf("\ttryResume: %p\n", pMod->tryResume); dbgprintf("\tdoHUP: %p\n", pMod->doHUP); - dbgprintf("\tnewScope: %p\n", pMod->mod.om.newScope); - dbgprintf("\trestoreScope: %p\n", pMod->mod.om.restoreScope); dbgprintf("\tBeginTransaction: %p\n", ((pMod->mod.om.beginTransaction == dummyBeginTransaction) ? NULL : pMod->mod.om.beginTransaction)); dbgprintf("\tEndTransaction: %p\n", ((pMod->mod.om.endTransaction == dummyEndTransaction) ? |