Attachment 699610 Details for Bug 909977 – First part (1/3) of proposed upstream patch to correct this

[patch] First part (1/3) of proposed upstream patch to correct this

v3-0001-imap-send-move-ifdef-around.txt (text/plain), 1.47 KB, created by Jan Lieskovsky on 2013-02-19 19:22:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Lieskovsky

Created: 2013-02-19 19:22:35 UTC

Size: 1.47 KB

patch

obsolete

>From 41b978d2e07232c21a30a4b2f055afdd245b0ea5 Mon Sep 17 00:00:00 2001
>From: Junio C Hamano <gitster@pobox.com>
>Date: Fri, 15 Feb 2013 12:32:19 -0800
>Subject: [PATCH v3 1/3] 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>
>---
> imap-send.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/imap-send.c b/imap-send.c
>index d42e471..75c14a0 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)
> {
>-- 
>1.8.1.3.701.g82b0977
>

Actions: View | Diff

Attachments on bug 909977: 699610 | 699611 | 699612 | 700017