summaryrefslogtreecommitdiffstats
path: root/ctok.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-20 08:48:20 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-20 08:48:20 +0000
commit0af8d22ff6e9fbd8eb89a1612ecf4604f058f78c (patch)
tree75456dcd5fd47274c2f5cd43eaebbbbe57865aab /ctok.c
parente2e775add92fae835119d132da33ea4ae0a5ae62 (diff)
downloadrsyslog-0af8d22ff6e9fbd8eb89a1612ecf4604f058f78c.zip
rsyslog-0af8d22ff6e9fbd8eb89a1612ecf4604f058f78c.tar.gz
rsyslog-0af8d22ff6e9fbd8eb89a1612ecf4604f058f78c.tar.xz
created new class ctok_token
Diffstat (limited to 'ctok.c')
-rw-r--r--ctok.c47
1 files changed, 45 insertions, 2 deletions
diff --git a/ctok.c b/ctok.c
index 6557b3f..eca6daa 100644
--- a/ctok.c
+++ b/ctok.c
@@ -323,20 +323,57 @@ finalize_it:
}
-/* Get the next token from the input stream. This parses the next token and
+/* Unget a token. The token ungotten will be returned the next time
+ * ctokGetToken() is called. Only one token can be ungotten at a time.
+ * If a second token is ungotten, the first is lost. This is considered
+ * a programming error.
+ * rgerhards, 2008-02-20
+ */
+rsRetVal
+ctokUngetToken(ctok_t *pThis, ctok_token_t *pToken)
+{
+ DEFiRet;
+
+ ISOBJ_TYPE_assert(pThis, ctok);
+ ASSERT(pToken != NULL);
+ ASSERT(pThis->pUngotToken == NULL);
+
+ pThis->pUngotToken = pToken;
+
+ RETiRet;
+}
+
+
+/* Get the *next* token from the input stream. This parses the next token and
* ignores any whitespace in between. End of stream is communicated via iRet.
+ * The returned token must either be destructed by the caller OR being passed
+ * back to ctokUngetToken().
* rgerhards, 2008-02-19
*/
rsRetVal
-ctokGetNextToken(ctok_t *pThis, ctok_token_t *pToken)
+ctokGetToken(ctok_t *pThis, ctok_token_t **ppToken)
{
DEFiRet;
+ ctok_token_t *pToken;
uchar c;
uchar szWord[128];
ISOBJ_TYPE_assert(pThis, ctok);
ASSERT(pToken != NULL);
+ /* first check if we have an ungotten token and, if so, provide that
+ * one back (without any parsing). -- rgerhards, 2008-02-20
+ */
+ if(pThis->pUngotToken != NULL) {
+ *ppToken = pThis->pUngotToken;
+ pThis->pUngotToken = NULL;
+ FINALIZE;
+ }
+
+ /* setup the stage - create our token */
+ CHKiRet(ctok_tokenConstruct(&pToken));
+ CHKiRet(ctok_tokenConstructFinalize(pToken));
+
CHKiRet(ctokSkipWhitespaceFromStream(pThis));
CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */
@@ -429,9 +466,15 @@ ctokGetNextToken(ctok_t *pThis, ctok_token_t *pToken)
break;
}
+ *ppToken = pToken;
RUNLOG_VAR("%d", pToken->tok);
finalize_it:
+ if(iRet != RS_RET_OK) {
+ if(pToken != NULL)
+ ctok_tokenDestruct(&pToken);
+ }
+
RETiRet;
}