diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-06-27 09:13:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-06-27 09:13:11 +0200 |
| commit | b5faa3c4cef4d8a076a2de9953806ea90c9052d7 (patch) | |
| tree | 8366c860ce6ec437ed1f3ddf6d97dccd8b526c7f | |
| parent | 2c46f3de7de4cdcfeac895a9711e1e99765b6a38 (diff) | |
| download | rsyslog-b5faa3c4cef4d8a076a2de9953806ea90c9052d7.tar.gz rsyslog-b5faa3c4cef4d8a076a2de9953806ea90c9052d7.tar.xz rsyslog-b5faa3c4cef4d8a076a2de9953806ea90c9052d7.zip | |
misc small changes: corrected version, removed some debug output,
..., restructured makefile, added some troubleshooting to test case
(program rscript-parse.c has problem due to different structure alignment,
where I do not yet know the reason)
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/status.html | 6 | ||||
| -rw-r--r-- | runtime/ctok.c | 3 | ||||
| -rw-r--r-- | tests/rscript-parse.c | 11 |
5 files changed, 16 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 0ca38b2e..e78a413c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,7 @@ EXTRA_DIST = \ contrib/gnutls/cert.pem \ contrib/gnutls/key.pem -SUBDIRS = doc tests runtime . +SUBDIRS = doc runtime . tests SUBDIRS += plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting diff --git a/configure.ac b/configure.ac index b3c3e625..e3b5a67b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[3.19.8-Test1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[3.19.8],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_HEADERS([config.h]) diff --git a/doc/status.html b/doc/status.html index efb42cab..47cd0700 100644 --- a/doc/status.html +++ b/doc/status.html @@ -2,7 +2,7 @@ <html><head><title>rsyslog status page</title></head> <body> <h2>rsyslog status page</h2> -<p>This page reflects the status as of 2008-06-16.</p> +<p>This page reflects the status as of 2008-06-27.</p> <h2>Current Releases</h2> <p><b>development:</b> 3.19.7 [2008-06-11] - @@ -13,8 +13,8 @@ <a href="http://www.rsyslog.com/Article242.phtml">change log</a> - <a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-109.phtml">download</a></p> -<p><b>v3 stable:</b> 3.16.1 [2008-05-02] - <a href="http://www.rsyslog.com/Article218.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-100.phtml">download</a> +<p><b>v3 stable:</b> 3.16.2 [2008-06-25] - <a href="http://www.rsyslog.com/Article244.phtml">change log</a> - +<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-114.phtml">download</a> <br><b>v2 stable:</b> 2.0.5 [2008-05-15] - <a href="http://www.rsyslog.com/Article226.phtml">change log</a> - <a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-104.phtml">download</a> diff --git a/runtime/ctok.c b/runtime/ctok.c index 927e6a47..11951d28 100644 --- a/runtime/ctok.c +++ b/runtime/ctok.c @@ -390,7 +390,6 @@ ctokGetToken(ctok_t *pThis, ctok_token_t **ppToken) uchar szWord[128]; int bRetry = 0; /* retry parse? Only needed for inline comments... */ -dbgprintf("ctokGetToken\n"); ISOBJ_TYPE_assert(pThis, ctok); ASSERT(ppToken != NULL); @@ -409,7 +408,6 @@ dbgprintf("ctokGetToken\n"); /* find the next token. We may loop when we have inline comments */ do { -dbgprintf("we search for a new token\n"); bRetry = 0; CHKiRet(ctokSkipWhitespaceFromStream(pThis)); CHKiRet(ctokGetCharFromStream(pThis, &c)); /* read a charater */ @@ -529,6 +527,7 @@ dbgprintf("we search for a new token\n"); dbgoprint((obj_t*) pToken, "token: %d\n", pToken->tok); finalize_it: +//dbgprintf("ctokGetToken, returns %d, returns token %d, addr %p\n", iRet, (*ppToken)->tok, &((*ppToken)->tok)); if(iRet != RS_RET_OK) { if(pToken != NULL) ctok_token.Destruct(&pToken); diff --git a/tests/rscript-parse.c b/tests/rscript-parse.c index e9c11a47..ba4a3dea 100644 --- a/tests/rscript-parse.c +++ b/tests/rscript-parse.c @@ -52,35 +52,44 @@ BEGINTest /* the string below is an expression as defined up to 3.19.x - note that the * then and the space after it MUST be present! */ - uchar szExpr[] = "$msg contains 'test' then "; + uchar szExpr[] = " $msg contains 'test' then "; /*uchar szSynErr[] = "$msg == 1 and syntaxerror ";*/ CODESTARTTest +printf("entering test, init done\n"); /* we first need a tokenizer... */ CHKiRet(ctok.Construct(&tok)); CHKiRet(ctok.Setpp(tok, szExpr)); CHKiRet(ctok.ConstructFinalize(tok)); +printf("done tokenizer\n"); /* now construct our expression */ CHKiRet(expr.Construct(&pExpr)); CHKiRet(expr.ConstructFinalize(pExpr)); +printf("done expr construct\n"); /* ready to go... */ CHKiRet(expr.Parse(pExpr, tok)); +printf("done parse\n"); /* we now need to parse off the "then" - and note an error if it is * missing... */ CHKiRet(ctok.GetToken(tok, &pToken)); +printf("pToken->tok addr %p\n", &(pToken->tok)); +printf("token received %d\n", pToken->tok); if(pToken->tok != ctok_THEN) { +printf("invalid token\n"); ctok_token.Destruct(&pToken); ABORT_FINALIZE(RS_RET_SYNTAX_ERROR); } +printf("token destructed\n"); ctok_token.Destruct(&pToken); /* no longer needed */ /* we are done, so we now need to restore things */ CHKiRet(ctok.Destruct(&tok)); finalize_it: +printf("exiting test, iRet %d\n", iRet); /* here we may do custom error reporting */ if(iRet != RS_RET_OK) { uchar *pp; |