diff options
| author | Nikita Gorskikh <ngorskikh@adguard.com> | 2020-09-18 16:34:34 +0300 |
|---|---|---|
| committer | Nikita Gorskikh <ngorskikh@adguard.com> | 2020-09-19 19:14:22 +0300 |
| commit | 56e121310954cbee2310c5eb2a3000115186563d (patch) | |
| tree | 846c2444ea95d0fbf94e9aa1cfe455ff927440d0 /bufferevent_sock.c | |
| parent | 9b270c5e02e47d372ad53e773f98668890b33e9f (diff) | |
| download | libevent-56e121310954cbee2310c5eb2a3000115186563d.tar.gz | |
Remove dead code from bufferevent_socket_connect
Diffstat (limited to 'bufferevent_sock.c')
| -rw-r--r-- | bufferevent_sock.c | 9 |
1 files changed, 2 insertions, 7 deletions
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; |