diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-07 12:11:54 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-07 12:11:54 +0200 |
| commit | 8ffdf2df8f1a08d2ae36fa9d39564bfd9fe982b6 (patch) | |
| tree | 859ec55ccbc5be23b4e414bf175ba6e8c94777a8 | |
| parent | 06001e951f5b5d0a7919c61057bc7a87b9eb8cba (diff) | |
| parent | f075387671870295227ae527007f2fb7290905bb (diff) | |
| download | rsyslog-8ffdf2df8f1a08d2ae36fa9d39564bfd9fe982b6.tar.gz rsyslog-8ffdf2df8f1a08d2ae36fa9d39564bfd9fe982b6.tar.xz rsyslog-8ffdf2df8f1a08d2ae36fa9d39564bfd9fe982b6.zip | |
Merge branch 'beta'
| -rw-r--r-- | doc/imrelp.html | 6 | ||||
| -rw-r--r-- | runtime/expr.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/imrelp.html b/doc/imrelp.html index b6f1f2bc..bfdaad84 100644 --- a/doc/imrelp.html +++ b/doc/imrelp.html @@ -35,10 +35,10 @@ Starts a RELP server on selected port</li> <li>see description</li> </ul> <p><b>Sample:</b></p> -<p>This sets up a RELP server on port 2514.<br> +<p>This sets up a RELP server on port 20514.<br> </p> <textarea rows="15" cols="60">$ModLoad imrelp # needs to be done just once -$InputRELPServerRun 2514 +$InputRELPServerRun 20514 </textarea> <p>[<a href="rsyslog_conf.html">rsyslog.conf overview</a>] [<a href="manual.html">manual index</a>] [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> @@ -49,4 +49,4 @@ Copyright © 2008 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and <a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL version 3 or higher.</font></p> -</body></html>
\ No newline at end of file +</body></html> diff --git a/runtime/expr.c b/runtime/expr.c index 9a314855..ee5b9e2c 100644 --- a/runtime/expr.c +++ b/runtime/expr.c @@ -114,7 +114,7 @@ terminal(expr_t *pThis, ctok_t *tok) finalize_it: if(pToken != NULL) { - CHKiRet(ctok_token.Destruct(&pToken)); /* "eat" processed token */ + ctok_token.Destruct(&pToken); /* "eat" processed token */ } RETiRet; |