Merge branch 'rs/pull-leakfix'

[thirdparty/git.git] / imap-send.c

diff --git a/imap-send.c b/imap-send.c
index ffb0a6eca8ce632dc448883a47987bf48adea31b..52737546f38b65f1cba1043dbda349d6680b78b6 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -24,7 +24,7 @@
 #include "cache.h"
 #include "config.h"
 #include "credential.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "run-command.h"
 #include "parse-options.h"
 #ifdef NO_OPENSSL
@@ -511,7 +511,7 @@ static int nfsnprintf(char *buf, int blen, const char *fmt, ...)
 
        va_start(va, fmt);
        if (blen <= 0 || (unsigned)(ret = vsnprintf(buf, blen, fmt, va)) >= (unsigned)blen)
-               die("BUG: buffer too small. Please report a bug.");
+               BUG("buffer too small. Please report a bug.");
        va_end(va);
        return ret;
 }
@@ -1114,7 +1114,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
 
                        if (!strcmp(srvc->auth_method, "CRAM-MD5")) {
                                if (!CAP(AUTH_CRAM_MD5)) {
-                                       fprintf(stderr, "You specified"
+                                       fprintf(stderr, "You specified "
                                                "CRAM-MD5 as authentication method, "
                                                "but %s doesn't support it.\n", srvc->host);
                                        goto bail;
@@ -1464,14 +1464,15 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred)
        curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
 
        if (0 < verbosity || getenv("GIT_CURL_VERBOSE"))
-               curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+               http_trace_curl_no_data();
        setup_curl_trace(curl);
 
        return curl;
 }
 
 static int curl_append_msgs_to_imap(struct imap_server_conf *server,
-                                   struct strbuf* all_msgs, int total) {
+                                   struct strbuf* all_msgs, int total)
+{
        int ofs = 0;
        int n = 0;
        struct buffer msgbuf = { STRBUF_INIT, 0 };