From: Thiago Farina <tfransosi@gmail.com>
Date: Wed, 02 Apr 2014 23:05:01 GMT
Subject: Re: socket_perror() "bug"?
Message-ID: <CACnwZYf30KLVLkaB4mNrW12DHwrf=RT7H-DBNvQYs0y6RqVGLw@mail.gmail.com>
In-Reply-To: <xmqqy4zq3xek.fsf@gitster.dls.corp.google.com>

On Mon, Mar 31, 2014 at 5:50 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Thiago Farina <tfransosi@gmail.com> writes:
>
>> In imap-send.c:socket_perror() we pass |func| as a parameter, which I
>> think it is the name of the function that "called" socket_perror, or
>> the name of the function which generated an error.
>>
>> But at line 184 and 187 it always assume it was SSL_connect.
>>
>> Should we instead call perror() and ssl_socket_error() with func?
>
> Looks that way to me, at least from a cursory look.
Would you accept such a patch?

diff --git a/imap-send.c b/imap-send.c
index 0bc6f7f..bb04768 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -181,10 +181,10 @@ static void socket_perror(const char *func,
struct imap_socket *sock, int ret)
                case SSL_ERROR_NONE:
                        break;
                case SSL_ERROR_SYSCALL:
-                       perror("SSL_connect");
+                       perror(func);
                        break;
                default:
-                       ssl_socket_perror("SSL_connect");
+                       ssl_socket_perror(func);
                        break;
                }
        } else

--
Thiago Farina