summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-06-10 08:18:10 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-06-10 08:18:10 +0200
commit8c0ac28fd9ff006154e78ffabd75a088cb8fe087 (patch)
tree936b3b0635b78826bdfb27ef4ba16421ad9be161
parent2658319224574a54a1c76ee02b6a7f3af5dab068 (diff)
downloadrsyslog-8c0ac28fd9ff006154e78ffabd75a088cb8fe087.tar.gz
rsyslog-8c0ac28fd9ff006154e78ffabd75a088cb8fe087.tar.xz
rsyslog-8c0ac28fd9ff006154e78ffabd75a088cb8fe087.zip
fixed syntax error (typo in var name) and cleaup
-rw-r--r--runtime/ctok.c10
-rw-r--r--runtime/ctok_token.c2
-rw-r--r--tools/syslogd.c2
3 files changed, 5 insertions, 9 deletions
diff --git a/runtime/ctok.c b/runtime/ctok.c
index de2bd8a8..c938a292 100644
--- a/runtime/ctok.c
+++ b/runtime/ctok.c
@@ -413,15 +413,15 @@ ctokGetToken(ctok_t *pThis, ctok_token_t **ppToken)
CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
switch(c) {
case '=': /* == */
- CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
+ CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a character */
pToken->tok = (c == '=')? ctok_CMP_EQ : ctok_INVALID;
break;
case '!': /* != */
- CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
+ CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a character */
pToken->tok = (c == '=')? ctok_CMP_NEQ : ctok_INVALID;
break;
case '<': /* <, <=, <> */
- CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
+ CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a character */
if(c == '=') {
pToken->tok = ctok_CMP_LTEQ;
} else if(c == '>') {
@@ -431,7 +431,7 @@ ctokGetToken(ctok_t *pThis, ctok_token_t **ppToken)
}
break;
case '>': /* >, >= */
- CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
+ CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a character */
if(c == '=') {
pToken->tok = ctok_CMP_GTEQ;
} else {
@@ -567,8 +567,6 @@ CODESTARTobjQueryInterface(ctok)
* work here (if we can support an older interface version - that,
* of course, also affects the "if" above).
*/
- //xxxpIf->oID = OBJctok;
-
pIf->Construct = ctokConstruct;
pIf->ConstructFinalize = ctokConstructFinalize;
pIf->Destruct = ctokDestruct;
diff --git a/runtime/ctok_token.c b/runtime/ctok_token.c
index 0f340675..8c17f693 100644
--- a/runtime/ctok_token.c
+++ b/runtime/ctok_token.c
@@ -109,8 +109,6 @@ CODESTARTobjQueryInterface(ctok_token)
* work here (if we can support an older interface version - that,
* of course, also affects the "if" above).
*/
- //xxxpIf->oID = OBJctok_token;
-
pIf->Construct = ctok_tokenConstruct;
pIf->ConstructFinalize = ctok_tokenConstructFinalize;
pIf->Destruct = ctok_tokenDestruct;
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 7f415f3c..ab4d6784 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2533,7 +2533,7 @@ mainloop(void)
* for the time being, I think the remaining risk can be accepted.
* rgerhards, 2008-01-10
*/
- if(bReducedRepeatMsgs == 1)
+ if(bReduceRepeatMsgs == 1)
doFlushRptdMsgs();
if(restart) {