]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix leftover 'if (false) ;' statements
authorGert Doering <gert@greenie.muc.de>
Tue, 21 Apr 2015 20:49:12 +0000 (22:49 +0200)
committerGert Doering <gert@greenie.muc.de>
Wed, 22 Apr 2015 15:44:07 +0000 (17:44 +0200)
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

src/openvpn/socket.c

index f5c740d8e5a60482d89705a2f595b0ad7f9d1703..afc1e60633564825e49541547f440a7de0ae715b 100644 (file)
@@ -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,