diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 11:46:06 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 11:46:06 +0100 |
commit | d3da845a61129c256c3e96fe144ea1dd67bac7c6 (patch) | |
tree | dd33fccce6c88b0225c609c382bd6c0c211173ae /tools/omfwd.c | |
parent | da75472096c45dd136d41c6e9ad7bf740069d3a1 (diff) | |
parent | 2181515805e65c37b9db5e0badef2a0a86164234 (diff) | |
download | rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.gz rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.tar.xz rsyslog-d3da845a61129c256c3e96fe144ea1dd67bac7c6.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools/omfwd.c')
-rw-r--r-- | tools/omfwd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/omfwd.c b/tools/omfwd.c index 481fabab..487bb35a 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -515,7 +515,6 @@ finalize_it: BEGINparseSelectorAct uchar *q; int i; - int bErr; rsRetVal localRet; struct addrinfo; TCPFRAMINGMODE tcp_framing = TCP_FRAMING_OCTET_STUFFING; @@ -638,7 +637,6 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) } /* now skip to template */ - bErr = 0; while(*p && *p != ';' && *p != '#' && !isspace((int) *p)) ++p; /*JUST SKIP*/ |