[PATCH 3/4] imap_send: setup_curl: use server_conf parameter instead of the global variable

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <nico...@morey-chaisemartin.com>
---
 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);
 
-       strbuf_addstr(&path, server.use_ssl ? "imaps://" : "imap://");
-       strbuf_addstr(&path, server.host);
+       strbuf_addstr(&path, srvc->use_ssl ? "imaps://" : "imap://");
+       strbuf_addstr(&path, srvc->host);
        if (!path.len || path.buf[path.len - 1] != '/')
                strbuf_addch(&path, '/');
-       strbuf_addstr(&path, server.folder);
+       strbuf_addstr(&path, srvc->folder);
 
        curl_easy_setopt(curl, CURLOPT_URL, path.buf);
        strbuf_release(&path);
-       curl_easy_setopt(curl, CURLOPT_PORT, server.port);
+       curl_easy_setopt(curl, CURLOPT_PORT, srvc->port);
 
-       if (server.auth_method) {
+       if (srvc->auth_method) {
 #if LIBCURL_VERSION_NUM < 0x072200
                warning("No LOGIN_OPTIONS support in this cURL version");
 #else
                struct strbuf auth = STRBUF_INIT;
                strbuf_addstr(&auth, "AUTH=");
-               strbuf_addstr(&auth, server.auth_method);
+               strbuf_addstr(&auth, srvc->auth_method);
                curl_easy_setopt(curl, CURLOPT_LOGIN_OPTIONS, auth.buf);
                strbuf_release(&auth);
 #endif
        }
 
-       if (!server.use_ssl)
+       if (!srvc->use_ssl)
                curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_TRY);
 
-       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, server.ssl_verify);
-       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, server.ssl_verify);
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, srvc->ssl_verify);
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, srvc->ssl_verify);
 
        curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
 
-- 
2.14.0.rc1.16.g87fcec1e8