[PATCH v2 5/7] csum-file: use idempotent git_hash_discard()
- From
Jeff King <peff@peff.net>
- Date
- Jul 8, 2026, 03:53 UTC
- Message-ID
- <20260708035300.GE41620@coredump.intra.peff.net>
- In-Reply-To
- <20260708035235.GA41491@coredump.intra.peff.net>
Now that it is safe to call git_hash_discard() even after finalizing it, we can simplify our cleanup logic a bit. This is mostly undoing a few bits of 64337aecde (csum-file: always finalize or discard hash, 2026-07-02):
- We no longer need a separate free_hashfile_memory() function for
finalize_hashfile(). It can just call free_hashfile(), which will
now discard (or not) the hash as appropriate. - When f->skip_hash is set, we don't need to discard; we can rely on
free_hashfile() to do it.Signed-off-by: Jeff King <peff@peff.net> --- csum-file.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/csum-file.c b/csum-file.c index 7e81391524..fe18ee1de3 100644 --- a/csum-file.c +++ b/csum-file.c @@ -55,32 +55,25 @@ void hashflush(struct hashfile *f) } } -static void free_hashfile_memory(struct hashfile *f) +void free_hashfile(struct hashfile *f) { + git_hash_discard(&f->ctx); free(f->buffer); free(f->check_buffer); free(f); } -void free_hashfile(struct hashfile *f) -{ - git_hash_discard(&f->ctx); - free_hashfile_memory(f); -} - int finalize_hashfile(struct hashfile *f, unsigned char *result, enum fsync_component component, unsigned int flags) { int fd; hashflush(f); - if (f->skip_hash) { - git_hash_discard(&f->ctx); + if (f->skip_hash) hashclr(f->buffer, f->algop); - } else { + else git_hash_final(f->buffer, &f->ctx); - } if (result) hashcpy(result, f->buffer, f->algop); @@ -105,7 +98,7 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result, if (close(f->check_fd)) die_errno("%s: sha1 file error on close", f->name); } - free_hashfile_memory(f); + free_hashfile(f); return fd; }
-- 2.55.0.459.g1b256877c9