On 7 August 2017 at 16:04, Nicolas Morey-Chaisemartin
<nicolas@xxxxxxxxxxxxxxxxxxxxxx> wrote:
> Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@xxxxxxxxxxxxxxxxxxxxxx>
> ---
> imap-send.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/imap-send.c b/imap-send.c
> index 682a06551..90b8683ed 100644
> --- a/imap-send.c
> +++ b/imap-send.c
> @@ -1415,37 +1415,37 @@ static CURL *setup_curl(struct imap_server_conf *srvc)
> if (!curl)
> die("curl_easy_init failed");
>
> - server_fill_credential(&server);
> - curl_easy_setopt(curl, CURLOPT_USERNAME, server.user);
> - curl_easy_setopt(curl, CURLOPT_PASSWORD, server.pass);
> + server_fill_credential(srvc);
> + curl_easy_setopt(curl, CURLOPT_USERNAME, srvc->user);
> + curl_easy_setopt(curl, CURLOPT_PASSWORD, srvc->pass);
Here you change the server_fill_credential-call that you just added.
Maybe do this patch earlier, perhaps even as patch 1?
I'm snipping lots of s/server/srvc/-changes... There's a less noisy
way of addressing the fact that srvc is unused: dropping it. I'm not
saying that's a good idea, but it could be considered, then explained
why this approach is better. There are some other functions which
access "server" directly, and some which take (and use!) a "srvc".
Maybe make the whole file consistent?
Martin
