diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-08 16:42:44 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-08 16:42:44 +0200 |
| commit | ed2cd2806e0cf00990c73f184698bf683ee10cc2 (patch) | |
| tree | 2a8077a3e609e76d89bf0e9cd23b19c03d50fd69 /runtime/modules.c | |
| parent | c897ac6e6de3b430911cad71e7453d8b4b3c57bc (diff) | |
| parent | 17e24eae733a0bce0eda65947e7559a05c91fc9c (diff) | |
| download | rsyslog-ed2cd2806e0cf00990c73f184698bf683ee10cc2.tar.gz rsyslog-ed2cd2806e0cf00990c73f184698bf683ee10cc2.tar.xz rsyslog-ed2cd2806e0cf00990c73f184698bf683ee10cc2.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
tools/omfile.c
Diffstat (limited to 'runtime/modules.c')
| -rw-r--r-- | runtime/modules.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/modules.c b/runtime/modules.c index bd201252..871f356a 100644 --- a/runtime/modules.c +++ b/runtime/modules.c @@ -383,7 +383,7 @@ doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_ * can never change in the lifetime of an module. -- rgerhards, 2007-12-14 */ CHKiRet((*pNew->modQueryEtryPt)((uchar*)"getType", &modGetType)); - CHKiRet((iRet = (*modGetType)(&pNew->eType)) != RS_RET_OK); + CHKiRet((*modGetType)(&pNew->eType)); dbgprintf("module of type %d being loaded.\n", pNew->eType); /* OK, we know we can successfully work with the module. So we now fill the |