kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

midx: drop unused parameters from add_midx_to_chain() 

When loading a chained midx, we build up an array of hashes, one per
layer of the chain. But since the chain is also represented by the
linked list of multi_pack_index structs, nobody actually reads this
array. We pass it to add_midx_to_chain(), but the parameters are
completely ignored.

So we can drop those unused parameters. And then we can see that its
sole caller, load_midx_chain_fd_st(), only cares about one layer hash at a
time (for parsing each line and feeding it to the single-layer midx
code). So we can replace the array with a single object_id on the stack.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2024-08-13 01:02:16 -04:00 committed by Junio C Hamano
parent fcb2205b77
commit 1784522a1f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
midx.c
View File

@ -264,9 +264,7 @@ static int open_multi_pack_index_chain(const char *chain_file,
} }


static int add_midx_to_chain(struct multi_pack_index *midx, static int add_midx_to_chain(struct multi_pack_index *midx,
struct multi_pack_index *midx_chain, struct multi_pack_index *midx_chain)
struct object_id *oids,
int n)
{ {
if (midx_chain) { if (midx_chain) {
if (unsigned_add_overflows(midx_chain->num_packs, if (unsigned_add_overflows(midx_chain->num_packs,
@ -300,21 +298,20 @@ static struct multi_pack_index *load_midx_chain_fd_st(const char *object_dir,
{ {
struct multi_pack_index *midx_chain = NULL; struct multi_pack_index *midx_chain = NULL;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct object_id *layers = NULL;
int valid = 1; int valid = 1;
uint32_t i, count; uint32_t i, count;
FILE *fp = xfdopen(fd, "r"); FILE *fp = xfdopen(fd, "r");


count = st->st_size / (the_hash_algo->hexsz + 1); count = st->st_size / (the_hash_algo->hexsz + 1);
CALLOC_ARRAY(layers, count);


for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
struct multi_pack_index *m; struct multi_pack_index *m;
struct object_id layer;


if (strbuf_getline_lf(&buf, fp) == EOF) if (strbuf_getline_lf(&buf, fp) == EOF)
break; break;


if (get_oid_hex(buf.buf, &layers[i])) { if (get_oid_hex(buf.buf, &layer)) {
warning(_("invalid multi-pack-index chain: line '%s' " warning(_("invalid multi-pack-index chain: line '%s' "
"not a hash"), "not a hash"),
buf.buf); buf.buf);
@ -325,12 +322,12 @@ static struct multi_pack_index *load_midx_chain_fd_st(const char *object_dir,
valid = 0; valid = 0;


strbuf_reset(&buf); strbuf_reset(&buf);
get_split_midx_filename_ext(&buf, object_dir, layers[i].hash, get_split_midx_filename_ext(&buf, object_dir, layer.hash,
MIDX_EXT_MIDX); MIDX_EXT_MIDX);
m = load_multi_pack_index_one(object_dir, buf.buf, local); m = load_multi_pack_index_one(object_dir, buf.buf, local);


if (m) { if (m) {
if (add_midx_to_chain(m, midx_chain, layers, i)) { if (add_midx_to_chain(m, midx_chain)) {
midx_chain = m; midx_chain = m;
valid = 1; valid = 1;
} else { } else {
@ -343,7 +340,6 @@ static struct multi_pack_index *load_midx_chain_fd_st(const char *object_dir,
} }
} }


free(layers);
fclose(fp); fclose(fp);
strbuf_release(&buf); strbuf_release(&buf);