diff options
| author | Gert Doering <gert@greenie.muc.de> | 2015-04-21 22:49:12 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2015-04-22 17:44:07 +0200 |
| commit | 0e3f894098f9286ec3e703ce16fe9bda0cd2c74e (patch) | |
| tree | 550c3e3f43f1af35d2034e6ef670ec8b7a3f0dd8 | |
| parent | 857c04ef06cd13d59c5b45332f07996e71372576 (diff) | |
| download | openvpn-0e3f894098f9286ec3e703ce16fe9bda0cd2c74e.tar.gz openvpn-0e3f894098f9286ec3e703ce16fe9bda0cd2c74e.tar.xz openvpn-0e3f894098f9286ec3e703ce16fe9bda0cd2c74e.zip | |
Fix leftover 'if (false) ;' statements
Commit a4b8f653ee5be9c2292c removed the #ifdefs for ENABLE_HTTP_PROXY and
ENABLE_SOCKS, thus making this "if (false) ; else if (...)" construct
superfluous. Spotted by David Sommerseth.
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1429649352-21034-1-git-send-email-gert@greenie.muc.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9603
| -rw-r--r-- | src/openvpn/socket.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index f5c740d..afc1e60 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -1575,10 +1575,8 @@ link_socket_init_phase1 (struct link_socket *sock, sock->sd = accept_from->sd; } - if (false) - ; /* are we running in HTTP proxy mode? */ - else if (sock->http_proxy) + if (sock->http_proxy) { ASSERT (sock->info.proto == PROTO_TCP_CLIENT); ASSERT (!sock->inetd); @@ -1793,9 +1791,7 @@ phase2_tcp_client (struct link_socket *sock, struct signal_info *sig_info) if (sig_info->signal_received) return; - if (false) - ; - else if (sock->http_proxy) + if (sock->http_proxy) { proxy_retry = establish_http_proxy_passthru (sock->http_proxy, sock->sd, |