The function `get_delta_base` currently relies on the global variable
`the_repository`. To eliminate global variable usage in `packfile.c`, we
should progressively shift the dependency on the_repository to higher
layers. Let's remove its usage from this function and any related ones.
Signed-off-by: Karthik Nayak <karthik.188@xxxxxxxxx>
---
builtin/pack-objects.c | 3 ++-
pack-bitmap.c | 4 ++--
packfile.c | 42 ++++++++++++++++++++----------------------
packfile.h | 6 +++---
4 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 3893135b59..a10eae239e 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1044,7 +1044,8 @@ static void write_reused_pack_one(struct packed_git *reuse_packfile,
unsigned char header[MAX_PACK_OBJECT_HEADER];
unsigned len;
- base_offset = get_delta_base(reuse_packfile, w_curs, &cur, type, offset);
+ base_offset = get_delta_base(the_repository, reuse_packfile,
+ w_curs, &cur, type, offset);
assert(base_offset != 0);
/* Convert to REF_DELTA if we must... */
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 96c91a080e..d959e30682 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -2085,8 +2085,8 @@ static int try_partial_reuse(struct bitmap_index *bitmap_git,
* and the normal slow path will complain about it in
* more detail.
*/
- base_offset = get_delta_base(pack->p, w_curs, &offset, type,
- delta_obj_offset);
+ base_offset = get_delta_base(the_repository, pack->p, w_curs,
+ &offset, type, delta_obj_offset);
if (!base_offset)
return 0;
diff --git a/packfile.c b/packfile.c
index 7a0d1957e9..ee46898b35 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1210,13 +1210,11 @@ const struct packed_git *has_packed_and_bad(struct repository *r,
return NULL;
}
-off_t get_delta_base(struct packed_git *p,
- struct pack_window **w_curs,
- off_t *curpos,
- enum object_type type,
- off_t delta_obj_offset)
+off_t get_delta_base(struct repository *repo, struct packed_git *p,
+ struct pack_window **w_curs, off_t *curpos,
+ enum object_type type, off_t delta_obj_offset)
{
- unsigned char *base_info = use_pack(the_repository, p, w_curs, *curpos, NULL);
+ unsigned char *base_info = use_pack(repo, p, w_curs, *curpos, NULL);
off_t base_offset;
/* use_pack() assured us we have [base_info, base_info + 20)
@@ -1243,7 +1241,7 @@ off_t get_delta_base(struct packed_git *p,
} else if (type == OBJ_REF_DELTA) {
/* The base entry _must_ be in the same pack */
base_offset = find_pack_entry_one(base_info, p);
- *curpos += the_hash_algo->rawsz;
+ *curpos += repo->hash_algo->rawsz;
} else
die("I am totally screwed");
return base_offset;
@@ -1255,22 +1253,19 @@ off_t get_delta_base(struct packed_git *p,
* the final object lookup), but more expensive for OFS deltas (we
* have to load the revidx to convert the offset back into a sha1).
*/
-static int get_delta_base_oid(struct packed_git *p,
- struct pack_window **w_curs,
- off_t curpos,
- struct object_id *oid,
- enum object_type type,
+static int get_delta_base_oid(struct repository *repo, struct packed_git *p,
+ struct pack_window **w_curs, off_t curpos,
+ struct object_id *oid, enum object_type type,
off_t delta_obj_offset)
{
if (type == OBJ_REF_DELTA) {
- unsigned char *base = use_pack(the_repository, p, w_curs,
- curpos, NULL);
- oidread(oid, base, the_repository->hash_algo);
+ unsigned char *base = use_pack(repo, p, w_curs, curpos, NULL);
+ oidread(oid, base, repo->hash_algo);
return 0;
} else if (type == OBJ_OFS_DELTA) {
uint32_t base_pos;
- off_t base_offset = get_delta_base(p, w_curs, &curpos,
- type, delta_obj_offset);
+ off_t base_offset = get_delta_base(repo, p, w_curs, &curpos, type,
+ delta_obj_offset);
if (!base_offset)
return -1;
@@ -1327,7 +1322,8 @@ static enum object_type packed_to_object_type(struct repository *r,
}
poi_stack[poi_stack_nr++] = obj_offset;
/* If parsing the base offset fails, just unwind */
- base_offset = get_delta_base(p, w_curs, &curpos, type, obj_offset);
+ base_offset = get_delta_base(r, p, w_curs, &curpos, type,
+ obj_offset);
if (!base_offset)
goto unwind;
curpos = obj_offset = base_offset;
@@ -1553,8 +1549,9 @@ int packed_object_info(struct repository *r, struct packed_git *p,
if (!oi->contentp && oi->sizep) {
if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
off_t tmp_pos = curpos;
- off_t base_offset = get_delta_base(p, &w_curs, &tmp_pos,
- type, obj_offset);
+ off_t base_offset = get_delta_base(r, p, &w_curs,
+ &tmp_pos, type,
+ obj_offset);
if (!base_offset) {
type = OBJ_BAD;
goto out;
@@ -1600,7 +1597,7 @@ int packed_object_info(struct repository *r, struct packed_git *p,
if (oi->delta_base_oid) {
if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
- if (get_delta_base_oid(p, &w_curs, curpos,
+ if (get_delta_base_oid(r, p, &w_curs, curpos,
oi->delta_base_oid,
type, obj_offset) < 0) {
type = OBJ_BAD;
@@ -1739,7 +1736,8 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
if (type != OBJ_OFS_DELTA && type != OBJ_REF_DELTA)
break;
- base_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
+ base_offset = get_delta_base(r, p, &w_curs, &curpos, type,
+ obj_offset);
if (!base_offset) {
error("failed to validate delta base reference "
"at offset %"PRIuMAX" from %s",
diff --git a/packfile.h b/packfile.h
index 488d78ae9f..050dc516b1 100644
--- a/packfile.h
+++ b/packfile.h
@@ -171,9 +171,9 @@ unsigned long get_size_from_delta(struct repository *repo, struct packed_git *,
struct pack_window **, off_t);
int unpack_object_header(struct repository *repo, struct packed_git *,
struct pack_window **, off_t *, unsigned long *);
-off_t get_delta_base(struct packed_git *p, struct pack_window **w_curs,
- off_t *curpos, enum object_type type,
- off_t delta_obj_offset);
+off_t get_delta_base(struct repository *repo, struct packed_git *p,
+ struct pack_window **w_curs, off_t *curpos,
+ enum object_type type, off_t delta_obj_offset);
void release_pack_memory(size_t);
--
2.47.0
