diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:55:41 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 11:55:41 +0200 |
commit | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (patch) | |
tree | 1749d023b626b2d30d9b9273b0d4f11fcbffea1b /tools/omfwd.c | |
parent | 0f52727043736b1e411bc60309ed18d41a4f1234 (diff) | |
parent | 0c65e62965eefc1f8cebfaa3636ef72fc21c5260 (diff) | |
download | rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.gz rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.tar.xz rsyslog-8939ccfffd3a0580ead376234ad64a9602d4e4e6.zip |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
action.c
configure.ac
doc/manual.html
runtime/ruleset.c
template.h
threads.c
tools/syslogd.c
Diffstat (limited to 'tools/omfwd.c')
-rw-r--r-- | tools/omfwd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/omfwd.c b/tools/omfwd.c index 96458941..2a19aae4 100644 --- a/tools/omfwd.c +++ b/tools/omfwd.c @@ -255,12 +255,12 @@ static rsRetVal UDPSend(instanceData *pData, char *msg, size_t len) * call fails. Then, lsent has the error status, even though * the sendto() succeeded. -- rgerhards, 2007-06-22 */ - bSendSuccess = FALSE; + bSendSuccess = RSFALSE; for (r = pData->f_addr; r; r = r->ai_next) { for (i = 0; i < *pData->pSockArray; i++) { lsent = sendto(pData->pSockArray[i+1], msg, len, 0, r->ai_addr, r->ai_addrlen); if (lsent == len) { - bSendSuccess = TRUE; + bSendSuccess = RSTRUE; break; } else { int eno = errno; @@ -273,7 +273,7 @@ static rsRetVal UDPSend(instanceData *pData, char *msg, size_t len) break; } /* finished looping */ - if (bSendSuccess == FALSE) { + if (bSendSuccess == RSFALSE) { dbgprintf("error forwarding via udp, suspending\n"); iRet = RS_RET_SUSPENDED; } |