From: Nikita Gorskikh Date: Fri, 18 Sep 2020 13:34:34 +0000 (+0300) Subject: Remove dead code from bufferevent_socket_connect X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56e121310954cbee2310c5eb2a3000115186563d;p=libevent Remove dead code from bufferevent_socket_connect --- diff --git a/bufferevent_sock.c b/bufferevent_sock.c index eca7b315..873fe7e9 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -396,7 +396,7 @@ bufferevent_socket_connect(struct bufferevent *bev, fd = evutil_socket_(sa->sa_family, SOCK_STREAM|EVUTIL_SOCK_NONBLOCK, 0); if (fd < 0) - goto freesock; + goto done; ownfd = 1; } if (sa) { @@ -431,16 +431,11 @@ bufferevent_socket_connect(struct bufferevent *bev, result = 0; goto done; } - } else if (r == 1) { + } else { /* The connect succeeded already. How very BSD of it. */ result = 0; bufev_p->connecting = 1; bufferevent_trigger_nolock_(bev, EV_WRITE, BEV_OPT_DEFER_CALLBACKS); - } else { - /* The connect failed already. How very BSD of it. */ - result = 0; - bufferevent_run_eventcb_(bev, BEV_EVENT_ERROR, BEV_OPT_DEFER_CALLBACKS); - bufferevent_disable(bev, EV_WRITE|EV_READ); } goto done;