undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imap-send: move #ifdef around

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2013-02-15 12:32:19 -08:00
parent f174a2583c
commit 1e1fe52923
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imap-send.c
View File

@ -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"); fprintf(stderr, "SSL requested but SSL support not compiled in\n");
return -1; return -1;
}
#else #else
static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify)
{
#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) #if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
const SSL_METHOD *meth; const SSL_METHOD *meth;
#else #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)
{ {