| Message ID | b3a12424d78e80553741f5c7a0672490a59b6f7d.1624314293.git.me@ttaylorr.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | multi-pack reachability bitmaps | expand |
On Mon, Jun 21 2021, Taylor Blau wrote: > These functions will be called from outside of midx.c in a subsequent > patch. So "a number" is "two" and "a subsequent patch" appears to be 13/24. I think this would be clearer just squashed into whatever needs it, or at least if it comes right before the new use in the series.
On Fri, Jun 25, 2021 at 01:42:06AM +0200, Ævar Arnfjörð Bjarmason wrote: > > On Mon, Jun 21 2021, Taylor Blau wrote: > > > These functions will be called from outside of midx.c in a subsequent > > patch. > > So "a number" is "two" and "a subsequent patch" appears to be 13/24. I > think this would be clearer just squashed into whatever needs it, or at > least if it comes right before the new use in the series. Good suggestion, thanks. This was probably written at a time when the number of functions I needed was larger (or perhaps when this and patches 10-12 were all jumbled together). In any case, I dropped this patch and squashed its contents into 13/24 where it is used. Thanks, Taylor
diff --git a/midx.c b/midx.c index 21d6a05e88..fa23d57a24 100644 --- a/midx.c +++ b/midx.c @@ -48,12 +48,12 @@ static uint8_t oid_version(void) } } -static const unsigned char *get_midx_checksum(struct multi_pack_index *m) +const unsigned char *get_midx_checksum(struct multi_pack_index *m) { return m->data + m->data_len - the_hash_algo->rawsz; } -static char *get_midx_filename(const char *object_dir) +char *get_midx_filename(const char *object_dir) { return xstrfmt("%s/pack/multi-pack-index", object_dir); } diff --git a/midx.h b/midx.h index 8684cf0fef..1172df1a71 100644 --- a/midx.h +++ b/midx.h @@ -42,6 +42,8 @@ struct multi_pack_index { #define MIDX_PROGRESS (1 << 0) #define MIDX_WRITE_REV_INDEX (1 << 1) +const unsigned char *get_midx_checksum(struct multi_pack_index *m); +char *get_midx_filename(const char *object_dir); char *get_midx_rev_filename(struct multi_pack_index *m); struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local);
These functions will be called from outside of midx.c in a subsequent patch. Signed-off-by: Taylor Blau <me@ttaylorr.com> --- midx.c | 4 ++-- midx.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)