fast-import: use write_pack_header()

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

diff --git a/imap-send.c b/imap-send.c
index b4eb886e2a6a40bce1e478d8d24f43f64ed2e3aa..5764dd812ca768002aacd67b066f9af22ab8994e 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -976,7 +976,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
 
                imap_info("Starting tunnel '%s'... ", srvc->tunnel);
 
-               argv_array_push(&tunnel.args, srvc->tunnel);
+               strvec_push(&tunnel.args, srvc->tunnel);
                tunnel.use_shell = 1;
                tunnel.in = -1;
                tunnel.out = -1;
@@ -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 };