Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11

diff --git a/http-walker.c b/http-walker.c
index 18bd6504beb99ab68f360c4fa93011efae42fdfb..51a906e9e3316582561304995e1a1bbbdcd6ca7c 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -3,8 +3,7 @@
 #include "walker.h"
 #include "http.h"
 
-struct alt_base
-{
+struct alt_base {
        char *base;
        int got_indices;
        struct packed_git *packs;
@@ -18,8 +17,7 @@ enum object_request_state {
        COMPLETE
 };
 
-struct object_request
-{
+struct object_request {
        struct walker *walker;
        unsigned char sha1[20];
        struct alt_base *repo;
@@ -187,7 +185,7 @@ static void process_alternates_response(void *callback_data)
        struct active_request_slot *slot = alt_req->slot;
        struct alt_base *tail = cdata->alt;
        const char *base = alt_req->base;
-       static const char null_byte = '\0';
+       const char null_byte = '\0';
        char *data;
        int i = 0;
 
@@ -220,7 +218,7 @@ static void process_alternates_response(void *callback_data)
                }
        }
 
-       fwrite_buffer(&null_byte, 1, 1, alt_req->buffer);
+       fwrite_buffer((char *)&null_byte, 1, 1, alt_req->buffer);
        alt_req->buffer->len--;
        data = alt_req->buffer->buf;