diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-05 13:39:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-05 13:39:58 +0200 |
| commit | cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b (patch) | |
| tree | d7119adeb9fa3eb2d17f5fae7b8f6c06d64ce0b4 /runtime/modules.c | |
| parent | 189c0284c11f8a9a689baf0c1f122a06a421058b (diff) | |
| parent | 54c375eb5b28d70fca023f7ca2fcc2cd0a4fa7ba (diff) | |
| download | rsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.tar.gz rsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.tar.bz2 rsyslog-cde0ac2b0c99a4ed1a7f47a14e0e84b57877a97b.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 eee3b46e..bdb15e7f 100644 --- a/runtime/modules.c +++ b/runtime/modules.c @@ -425,7 +425,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 |