pack-revindex: stop depending on `the_repository`

There are multiple sites in "pack-revindex.c" where we use the global
`the_repository` variable, either explicitly or implicitly by using
`the_hash_algo`. In all of those cases we already have a repository
available in the calling context though.

Refactor the code to instead use the caller-provided repository and
remove the `USE_THE_REPOSITORY_VARIABLE` define.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pack-revindex.c b/pack-revindex.c
index 78139e3d7f5c9fa9bf727c24700fcd05dce26d8d..038e0c96b1ca5efd4ede3b81138543657812fae1 100644 (file)
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -1,5 +1,3 @@
-#define USE_THE_REPOSITORY_VARIABLE
-
 #include "git-compat-util.h"
 #include "gettext.h"
 #include "pack-revindex.h"
@@ -9,6 +7,7 @@
 #include "strbuf.h"
 #include "trace2.h"
 #include "parse.h"
+#include "repository.h"
 #include "midx.h"
 #include "csum-file.h"
 
@@ -137,7 +136,7 @@ static void create_pack_revindex(struct packed_git *p)
        const unsigned num_ent = p->num_objects;
        unsigned i;
        const char *index = p->index_data;
-       const unsigned hashsz = the_hash_algo->rawsz;
+       const unsigned hashsz = p->repo->hash_algo->rawsz;
 
        ALLOC_ARRAY(p->revindex, num_ent + 1);
        index += 4 * 256;
@@ -193,7 +192,11 @@ static char *pack_revindex_filename(struct packed_git *p)
 }
 
 #define RIDX_HEADER_SIZE (12)
-#define RIDX_MIN_SIZE (RIDX_HEADER_SIZE + (2 * the_hash_algo->rawsz))
+
+static size_t ridx_min_size(const struct git_hash_algo *algo)
+{
+       return RIDX_HEADER_SIZE + (2 * algo->rawsz);
+}
 
 struct revindex_header {
        uint32_t signature;
@@ -201,7 +204,8 @@ struct revindex_header {
        uint32_t hash_id;
 };
 
-static int load_revindex_from_disk(char *revindex_name,
+static int load_revindex_from_disk(const struct git_hash_algo *algo,
+                                  char *revindex_name,
                                   uint32_t num_objects,
                                   const uint32_t **data_p, size_t *len_p)
 {
@@ -228,12 +232,12 @@ static int load_revindex_from_disk(char *revindex_name,
 
        revindex_size = xsize_t(st.st_size);
 
-       if (revindex_size < RIDX_MIN_SIZE) {
+       if (revindex_size < ridx_min_size(algo)) {
                ret = error(_("reverse-index file %s is too small"), revindex_name);
                goto cleanup;
        }
 
-       if (revindex_size - RIDX_MIN_SIZE != st_mult(sizeof(uint32_t), num_objects)) {
+       if (revindex_size - ridx_min_size(algo) != st_mult(sizeof(uint32_t), num_objects)) {
                ret = error(_("reverse-index file %s is corrupt"), revindex_name);
                goto cleanup;
        }
@@ -279,7 +283,8 @@ int load_pack_revindex_from_disk(struct packed_git *p)
 
        revindex_name = pack_revindex_filename(p);
 
-       ret = load_revindex_from_disk(revindex_name,
+       ret = load_revindex_from_disk(p->repo->hash_algo,
+                                     revindex_name,
                                      p->num_objects,
                                      &p->revindex_map,
                                      &p->revindex_size);
@@ -322,7 +327,7 @@ int verify_pack_revindex(struct packed_git *p)
        if (!p->revindex_map || !p->revindex_data)
                return res;
 
-       if (!hashfile_checksum_valid(the_repository->hash_algo,
+       if (!hashfile_checksum_valid(p->repo->hash_algo,
                                     (const unsigned char *)p->revindex_map, p->revindex_size)) {
                error(_("invalid checksum"));
                res = -1;
@@ -375,19 +380,20 @@ int load_midx_revindex(struct multi_pack_index *m)
                 * not want to accidentally call munmap() in the middle of the
                 * MIDX.
                 */
-               trace2_data_string("load_midx_revindex", the_repository,
+               trace2_data_string("load_midx_revindex", m->repo,
                                   "source", "midx");
                m->revindex_data = (const uint32_t *)m->chunk_revindex;
                return 0;
        }
 
-       trace2_data_string("load_midx_revindex", the_repository,
+       trace2_data_string("load_midx_revindex", m->repo,
                           "source", "rev");
 
        get_midx_filename_ext(m->repo->hash_algo, &revindex_name, m->object_dir,
                              get_midx_checksum(m), MIDX_EXT_REV);
 
-       ret = load_revindex_from_disk(revindex_name.buf,
+       ret = load_revindex_from_disk(m->repo->hash_algo,
+                                     revindex_name.buf,
                                      m->num_objects,
                                      &m->revindex_map,
                                      &m->revindex_len);
@@ -419,7 +425,7 @@ int offset_to_pack_pos(struct packed_git *p, off_t ofs, uint32_t *pos)
 {
        unsigned lo, hi;
 
-       if (load_pack_revindex(the_repository, p) < 0)
+       if (load_pack_revindex(p->repo, p) < 0)
                return -1;
 
        lo = 0;
@@ -465,7 +471,7 @@ off_t pack_pos_to_offset(struct packed_git *p, uint32_t pos)
        if (p->revindex)
                return p->revindex[pos].offset;
        else if (pos == p->num_objects)
-               return p->pack_size - the_hash_algo->rawsz;
+               return p->pack_size - p->repo->hash_algo->rawsz;
        else
                return nth_packed_object_offset(p, pack_pos_to_index(p, pos));
 }