]> git.ipfire.org Git - thirdparty/git.git/commitdiff
connected: switch GIT_SHA1_HEXSZ to the_hash_algo
authorbrian m. carlson <sandals@crustytoothpaste.net>
Sun, 18 Aug 2019 20:04:10 +0000 (20:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2019 22:04:58 +0000 (15:04 -0700)
Switch various uses of GIT_SHA1_HEXSZ to reference the_hash_algo
instead.

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

index cd9b324afa5a33be7eced6a420061905d52c211f..7cd3bc997970113b36874654b99230450356e841 100644 (file)
@@ -28,6 +28,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
        struct packed_git *new_pack = NULL;
        struct transport *transport;
        size_t base_len;
+       const unsigned hexsz = the_hash_algo->hexsz;
 
        if (!opt)
                opt = &defaults;
@@ -99,7 +100,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 
        sigchain_push(SIGPIPE, SIG_IGN);
 
-       commit[GIT_SHA1_HEXSZ] = '\n';
+       commit[hexsz] = '\n';
        do {
                /*
                 * If index-pack already checked that:
@@ -112,8 +113,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
                if (new_pack && find_pack_entry_one(oid.hash, new_pack))
                        continue;
 
-               memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ);
-               if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) {
+               memcpy(commit, oid_to_hex(&oid), hexsz);
+               if (write_in_full(rev_list.in, commit, hexsz + 1) < 0) {
                        if (errno != EPIPE && errno != EINVAL)
                                error_errno(_("failed write to rev-list"));
                        err = -1;