diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-02 17:18:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-02 17:18:43 +0200 |
| commit | 90ed676c54c05cc87f0dbde96447abc8efc166d8 (patch) | |
| tree | 06bba2fa1e6fd8e5ed70c13657f8c17ccd07a65a /tools | |
| parent | e9c659c1578a114fa6e0d9cdf2729b60ba078a91 (diff) | |
| parent | b37a1eb0f8422102c11c597f15139d64c2d51c13 (diff) | |
| download | rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.gz rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.xz rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.zip | |
Merge branch 'master' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/omfile.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index b62d9c57..82944a96 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -65,7 +65,6 @@ #include "module-template.h" #include "errmsg.h" #include "stream.h" -#include "zlibw.h" #include "unicode-helper.h" MODULE_TYPE_OUTPUT @@ -74,7 +73,6 @@ MODULE_TYPE_OUTPUT */ DEF_OMOD_STATIC_DATA DEFobjCurrIf(errmsg) -DEFobjCurrIf(zlibw) DEFobjCurrIf(strm) /* The following structure is a dynafile name cache entry. @@ -745,7 +743,6 @@ BEGINmodExit CODESTARTmodExit objRelease(errmsg, CORE_COMPONENT); objRelease(strm, CORE_COMPONENT); - objRelease(zlibw, LM_ZLIBW_FILENAME); free(pszTplName); ENDmodExit @@ -762,7 +759,6 @@ CODESTARTmodInit *ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */ CODEmodInit_QueryRegCFSLineHdlr CHKiRet(objUse(errmsg, CORE_COMPONENT)); - CHKiRet(objUse(zlibw, LM_ZLIBW_FILENAME)); CHKiRet(objUse(strm, CORE_COMPONENT)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"dynafilecachesize", 0, eCmdHdlrInt, (void*) setDynaFileCacheSize, NULL, STD_LOADABLE_MODULE_ID)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"omfileziplevel", 0, eCmdHdlrInt, NULL, &iZipLevel, STD_LOADABLE_MODULE_ID)); |