diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-02-01 17:46:47 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-02-01 17:46:47 +0100 |
commit | 6b5321bcdba0b172cb9830c992721737468bc192 (patch) | |
tree | 4b1e2021c42c347299df914d8970719f6324f3cb | |
parent | ce8e072564da6c3ef16755d8c3df8614895a717e (diff) | |
download | rsyslog-6b5321bcdba0b172cb9830c992721737468bc192.tar.gz rsyslog-6b5321bcdba0b172cb9830c992721737468bc192.tar.xz rsyslog-6b5321bcdba0b172cb9830c992721737468bc192.zip |
cleanup: remove code for no-longer needed legacy conf functionality
-rw-r--r-- | parse.c | 9 | ||||
-rw-r--r-- | parse.h | 2 | ||||
-rw-r--r-- | runtime/conf.c | 2 |
3 files changed, 5 insertions, 8 deletions
@@ -211,7 +211,7 @@ rsRetVal parsSkipAfterChar(rsParsObj *pThis, char c) * If bRequireOne is set to true, at least one whitespace * must exist, else an error is returned. */ -rsRetVal parsSkipWhitespace(rsParsObj *pThis, sbool bRequireOne) +rsRetVal parsSkipWhitespace(rsParsObj *pThis) { register unsigned char *pC; int numSkipped; @@ -230,9 +230,6 @@ rsRetVal parsSkipWhitespace(rsParsObj *pThis, sbool bRequireOne) ++numSkipped; } - if(bRequireOne && numSkipped == 0) - iRet = RS_RET_MISSING_WHITESPACE; - RETiRet; } @@ -261,7 +258,7 @@ rsRetVal parsDelimCStr(rsParsObj *pThis, cstr_t **ppCStr, char cDelim, int bTrim CHKiRet(rsCStrConstruct(&pCStr)); if(bTrimLeading) - parsSkipWhitespace(pThis, 0); + parsSkipWhitespace(pThis); pC = rsCStrGetBufBeg(pThis->pCStr) + pThis->iCurrPos; @@ -392,7 +389,7 @@ rsRetVal parsAddrWithBits(rsParsObj *pThis, struct NetAddr **pIP, int *pBits) CHKiRet(cstrConstruct(&pCStr)); - parsSkipWhitespace(pThis, 0); + parsSkipWhitespace(pThis); pC = rsCStrGetBufBeg(pThis->pCStr) + pThis->iCurrPos; /* we parse everything until either '/', ',' or @@ -76,7 +76,7 @@ rsRetVal rsParsAssignString(rsParsObj *pThis, cstr_t *pCStr); rsRetVal parsInt(rsParsObj *pThis, int* pInt); /* Skip whitespace. Often used to trim parsable entries. */ -rsRetVal parsSkipWhitespace(rsParsObj *pThis, sbool bRequireOne); +rsRetVal parsSkipWhitespace(rsParsObj *pThis); /* Parse string up to a delimiter. * diff --git a/runtime/conf.c b/runtime/conf.c index 7f6ad61a..eec04df8 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -596,7 +596,7 @@ rsRetVal cflineProcessPropFilter(uchar **pline, register rule_t *f) } /* skip to action part */ - if((iRet = parsSkipWhitespace(pPars, 0)) != RS_RET_OK) { + if((iRet = parsSkipWhitespace(pPars)) != RS_RET_OK) { errmsg.LogError(0, iRet, "error %d skipping to action part - ignoring selector", iRet); rsParsDestruct(pPars); return(iRet); |