From 57199f80c93f9be4e4526a118cb7347c282bc5f6 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 28 Feb 2012 15:06:59 +0000 Subject: [PATCH] - Fix from code review, if EINPROGRESS not defined chain if statement differently. git-svn-id: file:///svn/unbound/trunk@2636 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 4 ++++ util/netevent.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/Changelog b/doc/Changelog index 0d7b1d44a..757f709c8 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +28 February 2012: Wouter + - Fix from code review, if EINPROGRESS not defined chain if statement + differently. + 27 February 2012: Wouter - Fix bug#434: on windows check registry for config file location for unbound-control.exe, and unbound-checkconf.exe. diff --git a/util/netevent.c b/util/netevent.c index 1317e5414..c026e1daf 100644 --- a/util/netevent.c +++ b/util/netevent.c @@ -1195,8 +1195,9 @@ comm_point_tcp_handle_write(int fd, struct comm_point* c) #if defined(EINPROGRESS) && defined(EWOULDBLOCK) if(error == EINPROGRESS || error == EWOULDBLOCK) return 1; /* try again later */ + else #endif - else if(error != 0 && verbosity < 2) + if(error != 0 && verbosity < 2) return 0; /* silence lots of chatter in the logs */ else if(error != 0) { log_err("tcp connect: %s", strerror(error)); -- 2.47.2