git-am: Don't accept an mbox on stdin of we already have a .dotest directory

diff --git a/http.c b/http.c
index 146cf7bf36d715ea410c0646d83c47148d426444..6c1937b676ecd584cededed1c82df30448046ebe 100644 (file)
--- a/http.c
+++ b/http.c
@@ -34,7 +34,7 @@ size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
        size_t size = eltsize * nmemb;
        if (size > buffer->size - buffer->posn)
                size = buffer->size - buffer->posn;
-       memcpy(ptr, buffer->buffer + buffer->posn, size);
+       memcpy(ptr, (char *) buffer->buffer + buffer->posn, size);
        buffer->posn += size;
        return size;
 }
@@ -49,7 +49,7 @@ size_t fwrite_buffer(const void *ptr, size_t eltsize,
                        buffer->size = buffer->posn + size;
                buffer->buffer = xrealloc(buffer->buffer, buffer->size);
        }
-       memcpy(buffer->buffer + buffer->posn, ptr, size);
+       memcpy((char *) buffer->buffer + buffer->posn, ptr, size);
        buffer->posn += size;
        data_received++;
        return size;
@@ -286,7 +286,8 @@ void http_cleanup(void)
        curl_multi_cleanup(curlm);
 #endif
        curl_global_cleanup();
-       
+
+       curl_slist_free_all(pragma_header);
 }
 
 struct active_request_slot *get_active_slot(void)
@@ -438,11 +439,15 @@ void release_active_slot(struct active_request_slot *slot)
 {
        closedown_active_slot(slot);
        if (slot->curl) {
+#ifdef USE_CURL_MULTI
                curl_multi_remove_handle(curlm, slot->curl);
+#endif
                curl_easy_cleanup(slot->curl);
                slot->curl = NULL;
        }
+#ifdef USE_CURL_MULTI
        fill_active_slots();
+#endif
 }
 
 static void finish_active_slot(struct active_request_slot *slot)