| Message ID | ff163a621d3b55924882cea1d1c51c074ce2cae9.1710706118.git.ps@pks.im (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | refs: introduce `--auto` to pack refs as needed | expand |
Patrick Steinhardt <ps@pks.im> writes: > Some of the command line options in `cmd_pack_refs()` require us to > allocate memory. This memory is never released and thus leaking, but we > paper over this leak by declaring the respective variables as `static` > function-level variables, which is somewhat awkward. > > Refactor the code to release the allocated memory and drop the `static` > declaration. While at it, remove the useless `flags` variable. > Tangent: I was looking at `files_pack_refs` and it seems like there are a bunch of `die(...)` calls there. I wonder if it would be nicer to use `error()` instead so we could do a better job at cleanup.
On Wed, Mar 20, 2024 at 04:23:54PM -0700, Karthik Nayak wrote: > Patrick Steinhardt <ps@pks.im> writes: > > > Some of the command line options in `cmd_pack_refs()` require us to > > allocate memory. This memory is never released and thus leaking, but we > > paper over this leak by declaring the respective variables as `static` > > function-level variables, which is somewhat awkward. > > > > Refactor the code to release the allocated memory and drop the `static` > > declaration. While at it, remove the useless `flags` variable. > > > > Tangent: I was looking at `files_pack_refs` and it seems like there are > a bunch of `die(...)` calls there. I wonder if it would be nicer to use > `error()` instead so we could do a better job at cleanup. I agree that this would be a nice refactoring. Patrick
diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c index 97921beef2..ea2baeec76 100644 --- a/builtin/pack-refs.c +++ b/builtin/pack-refs.c @@ -13,15 +13,17 @@ static char const * const pack_refs_usage[] = { int cmd_pack_refs(int argc, const char **argv, const char *prefix) { - unsigned int flags = PACK_REFS_PRUNE; - static struct ref_exclusions excludes = REF_EXCLUSIONS_INIT; - static struct string_list included_refs = STRING_LIST_INIT_NODUP; - struct pack_refs_opts pack_refs_opts = { .exclusions = &excludes, - .includes = &included_refs, - .flags = flags }; - static struct string_list option_excluded_refs = STRING_LIST_INIT_NODUP; + struct ref_exclusions excludes = REF_EXCLUSIONS_INIT; + struct string_list included_refs = STRING_LIST_INIT_NODUP; + struct pack_refs_opts pack_refs_opts = { + .exclusions = &excludes, + .includes = &included_refs, + .flags = PACK_REFS_PRUNE, + }; + struct string_list option_excluded_refs = STRING_LIST_INIT_NODUP; struct string_list_item *item; int pack_all = 0; + int ret; struct option opts[] = { OPT_BOOL(0, "all", &pack_all, N_("pack everything")), @@ -45,5 +47,10 @@ int cmd_pack_refs(int argc, const char **argv, const char *prefix) if (!pack_refs_opts.includes->nr) string_list_append(pack_refs_opts.includes, "refs/tags/*"); - return refs_pack_refs(get_main_ref_store(the_repository), &pack_refs_opts); + ret = refs_pack_refs(get_main_ref_store(the_repository), &pack_refs_opts); + + clear_ref_exclusions(&excludes); + string_list_clear(&included_refs, 0); + string_list_clear(&option_excluded_refs, 0); + return ret; }
Some of the command line options in `cmd_pack_refs()` require us to allocate memory. This memory is never released and thus leaking, but we paper over this leak by declaring the respective variables as `static` function-level variables, which is somewhat awkward. Refactor the code to release the allocated memory and drop the `static` declaration. While at it, remove the useless `flags` variable. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- builtin/pack-refs.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)