http-walker: replace sha1_to_hex

Since sha1_to_hex is limited to SHA-1, replace the uses of it in this
file with hash_to_hex.  Rename several variables accordingly to reflect
that they are no longer limited to SHA-1.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-walker.c b/http-walker.c
index 8063896cf624d1a58ebeba5f1862fe7c7d1dc71f..e11670eee21456468cb70a3bddd0c9883e6c0495 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -434,9 +434,9 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne
 
        if (walker->get_verbosely) {
                fprintf(stderr, "Getting pack %s\n",
 
        if (walker->get_verbosely) {
                fprintf(stderr, "Getting pack %s\n",

-                       sha1_to_hex(target->hash));
+                       hash_to_hex(target->hash));

                fprintf(stderr, " which contains %s\n",
                fprintf(stderr, " which contains %s\n",

-                       sha1_to_hex(sha1));
+                       hash_to_hex(sha1));

        }
 
        preq = new_http_pack_request(target, repo->base);
        }
 
        preq = new_http_pack_request(target, repo->base);


@@ -473,9 +473,9 @@ static void abort_object_request(struct object_request *obj_req)
        release_object_request(obj_req);
 }
 
        release_object_request(obj_req);
 }
 

-static int fetch_object(struct walker *walker, unsigned char *sha1)
+static int fetch_object(struct walker *walker, unsigned char *hash)

 {
 {

-       char *hex = sha1_to_hex(sha1);
+       char *hex = hash_to_hex(hash);

        int ret = 0;
        struct object_request *obj_req = NULL;
        struct http_object_request *req;
        int ret = 0;
        struct object_request *obj_req = NULL;
        struct http_object_request *req;


@@ -483,7 +483,7 @@ static int fetch_object(struct walker *walker, unsigned char *sha1)
 
        list_for_each(pos, head) {
                obj_req = list_entry(pos, struct object_request, node);
 
        list_for_each(pos, head) {
                obj_req = list_entry(pos, struct object_request, node);

-               if (hasheq(obj_req->oid.hash, sha1))
+               if (hasheq(obj_req->oid.hash, hash))

                        break;
        }
        if (obj_req == NULL)
                        break;
        }
        if (obj_req == NULL)


@@ -557,20 +557,20 @@ static int fetch_object(struct walker *walker, unsigned char *sha1)
        return ret;
 }
 
        return ret;
 }
 

-static int fetch(struct walker *walker, unsigned char *sha1)
+static int fetch(struct walker *walker, unsigned char *hash)

 {
        struct walker_data *data = walker->data;
        struct alt_base *altbase = data->alt;
 
 {
        struct walker_data *data = walker->data;
        struct alt_base *altbase = data->alt;
 

-       if (!fetch_object(walker, sha1))
+       if (!fetch_object(walker, hash))

                return 0;
        while (altbase) {
                return 0;
        while (altbase) {

-               if (!http_fetch_pack(walker, altbase, sha1))
+               if (!http_fetch_pack(walker, altbase, hash))

                        return 0;
                fetch_alternates(walker, data->alt->base);
                altbase = altbase->next;
        }
                        return 0;
                fetch_alternates(walker, data->alt->base);
                altbase = altbase->next;
        }

-       return error("Unable to find %s under %s", sha1_to_hex(sha1),
+       return error("Unable to find %s under %s", hash_to_hex(hash),

                     data->alt->base);
 }
 
                     data->alt->base);
 }