diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | plugins/mmnormalize/mmnormalize.c | 9 |
2 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 7.3.5 [devel] 2012-11-?? +- bugfix: mmnormalize build problems +--------------------------------------------------------------------------- Version 7.3.4 [devel] 2012-11-23 - further (and rather drastically) improved disk queue performance we now save one third of the IO calls diff --git a/plugins/mmnormalize/mmnormalize.c b/plugins/mmnormalize/mmnormalize.c index 1aef98eb..36d8c9fb 100644 --- a/plugins/mmnormalize/mmnormalize.c +++ b/plugins/mmnormalize/mmnormalize.c @@ -104,13 +104,13 @@ buildInstance(instanceData *pData) { DEFiRet; if((pData->ctxee = ee_initCtx()) == NULL) { - errmsg.LogError(0, RS_RET_LIBEE_INIT, "error: could not initialize libee " + errmsg.LogError(0, RS_RET_ERR_LIBEE_INIT, "error: could not initialize libee " "ctx, cannot activate action"); ABORT_FINALIZE(RS_RET_ERR_LIBEE_INIT); } if((pData->ctxln = ln_initCtx()) == NULL) { - errmsg.LogError(0, RS_RET_LIBLOGNORM_INIT, "error: could not initialize " + errmsg.LogError(0, RS_RET_ERR_LIBLOGNORM_INIT, "error: could not initialize " "liblognorm ctx, cannot activate action"); ee_exitCtx(pData->ctxee); ABORT_FINALIZE(RS_RET_ERR_LIBLOGNORM_INIT); @@ -165,7 +165,6 @@ ENDactivateCnf BEGINfreeCnf CODESTARTfreeCnf - free(pModConf->tplName); ENDfreeCnf @@ -249,9 +248,7 @@ setInstParamDefaults(instanceData *pData) BEGINnewActInst struct cnfparamvals *pvals; - uchar *tplToUse; int i; - rsRetVal localRet; CODESTARTnewActInst DBGPRINTF("newActInst (mmnormalize)\n"); @@ -274,7 +271,7 @@ CODESTARTnewActInst if(!pvals[i].bUsed) continue; if(!strcmp(actpblk.descr[i].name, "rulebase")) { - pData->rulebase = es_str2cstr(pvals[i].val.d.estr, NULL); + pData->rulebase = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL); } else if(!strcmp(actpblk.descr[i].name, "userawmsg")) { pData->bUseRawMsg = (int) pvals[i].val.d.n; } else { |