diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-28 09:15:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-28 09:15:05 +0200 |
| commit | 22a4fed5561c940dd8ed5ba520b10035799bab18 (patch) | |
| tree | 16674ec1f1fb4c8387e54b8a65f070431263ab69 | |
| parent | 8caf952c8371c871049d5c822f77cd2e4d260be6 (diff) | |
| download | rsyslog-22a4fed5561c940dd8ed5ba520b10035799bab18.tar.gz rsyslog-22a4fed5561c940dd8ed5ba520b10035799bab18.tar.bz2 rsyslog-22a4fed5561c940dd8ed5ba520b10035799bab18.zip | |
cleanup
recent enhancement in RainerScript param handlers permit to remove
now-redundant code
| -rw-r--r-- | runtime/rsconf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index b45746c4..982013e9 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -347,15 +347,11 @@ inputProcessCnf(struct cnfobj *o) pvals = nvlstGetParams(o->nvlst, &inppblk, NULL); if(pvals == NULL) { - ABORT_FINALIZE(RS_RET_ERR); + ABORT_FINALIZE(RS_RET_CONFIG_ERROR); } DBGPRINTF("input param blk after inputProcessCnf:\n"); cnfparamsPrint(&inppblk, pvals); typeIdx = cnfparamGetIdx(&inppblk, "type"); - if(pvals[typeIdx].bUsed == 0) { - errmsg.LogError(0, RS_RET_CONF_RQRD_PARAM_MISSING, "input type missing"); - ABORT_FINALIZE(RS_RET_CONF_RQRD_PARAM_MISSING); // TODO: move this into rainerscript handlers - } cnfModName = (uchar*)es_str2cstr(pvals[typeIdx].val.d.estr, NULL); if((pMod = module.FindWithCnfName(loadConf, cnfModName, eMOD_IN)) == NULL) { errmsg.LogError(0, RS_RET_MOD_UNKNOWN, "input module name '%s' is unknown", cnfModName); |