diff options
author | Jeff King <peff@peff.net> | 2020-08-13 11:55:00 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-13 11:04:58 -0700 |
commit | d5e1961c19a2b638a700d03729cbb6c27fe5a3e8 (patch) | |
tree | 65a006210a42de947d1202d1bce01bfcd06378a4 /midx.c | |
parent | Git 2.28 (diff) | |
download | tgif-d5e1961c19a2b638a700d03729cbb6c27fe5a3e8.tar.xz |
stop calling UNLEAK() before die()
The point of UNLEAK() is to make a reference to a variable that is about
to go out of scope so that leak-checkers will consider it to be
not-leaked. Doing so right before die() is therefore pointless; even
though we are about to exit the program, the variable will still be on
the stack and accessible to leak-checkers.
These annotations aren't really hurting anything, but they clutter the
code and set a bad example of how to use UNLEAK().
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'midx.c')
-rw-r--r-- | midx.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -807,11 +807,9 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index * int result = 0; midx_name = get_midx_filename(object_dir); - if (safe_create_leading_directories(midx_name)) { - UNLEAK(midx_name); + if (safe_create_leading_directories(midx_name)) die_errno(_("unable to create leading directories of %s"), midx_name); - } if (m) packs.m = m; @@ -1051,10 +1049,8 @@ void clear_midx_file(struct repository *r) r->objects->multi_pack_index = NULL; } - if (remove_path(midx)) { - UNLEAK(midx); + if (remove_path(midx)) die(_("failed to clear multi-pack-index at %s"), midx); - } free(midx); } |