imap-send: move #ifdef around

Instead of adding an early return to the inside of the
ssl_socket_connect() function for NO_OPENSSL compilation, split it
into a separate stub function.

No functional change, but the next change to extend ssl_socket_connect()
will become easier to read this way.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/imap-send.c b/imap-send.c
index 9992233b96ba50f5dec590e3cebb4e628f3d5c5a..94f53c2c1d41d13c0e276280f594a4ec98752fa3 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -266,12 +266,17 @@ static void socket_perror(const char *func, struct imap_socket *sock, int ret)
        }
 }
 
        }
 }
 

+#ifdef NO_OPENSSL

 static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify)
 {
 static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify)
 {

-#ifdef NO_OPENSSL

        fprintf(stderr, "SSL requested but SSL support not compiled in\n");
        return -1;
        fprintf(stderr, "SSL requested but SSL support not compiled in\n");
        return -1;

+}
+

 #else
 #else

+
+static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify)
+{

 #if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
        const SSL_METHOD *meth;
 #else
 #if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
        const SSL_METHOD *meth;
 #else


@@ -323,8 +328,8 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
        }
 
        return 0;
        }
 
        return 0;

-#endif

 }
 }

+#endif

 
 static int socket_read(struct imap_socket *sock, char *buf, int len)
 {
 
 static int socket_read(struct imap_socket *sock, char *buf, int len)
 {