aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-15 12:32:19 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-18 16:33:07 -0800
commit1e1fe52923a8f582c4f50b41f0dd978d5d7c9bd3 (patch)
tree794ea2dddadb3f0e313d2ec8dc81e74fbd6b16cf
parentf174a2583c9f42315b60205890fa67a79a1f1669 (diff)
downloadgit-1e1fe52923a8f582c4f50b41f0dd978d5d7c9bd3.tar.gz
git-1e1fe52923a8f582c4f50b41f0dd978d5d7c9bd3.tar.xz
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>
-rw-r--r--imap-send.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/imap-send.c b/imap-send.c
index 9992233b9..94f53c2c1 100644
--- 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)
{
-#ifdef NO_OPENSSL
fprintf(stderr, "SSL requested but SSL support not compiled in\n");
return -1;
+}
+
#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
@@ -323,8 +328,8 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve
}
return 0;
-#endif
}
+#endif
static int socket_read(struct imap_socket *sock, char *buf, int len)
{