[PATCH v8 17/29] merge-recursive: make a helper function for cleanup for handle_renames
- From
Elijah Newren <newren@gmail.com>
- Date
- Feb 14, 2018, 18:51 UTC
- Message-ID
- <20180214185206.15492-18-newren@gmail.com>
- In-Reply-To
- <20180214185206.15492-1-newren@gmail.com>
In anticipation of more involved cleanup to come, make a helper function for doing the cleanup at the end of handle_renames. Rename the already existing cleanup_rename[s]() to final_cleanup_rename[s](), name the new helper initial_cleanup_rename(), and leave the big comment in the code about why we can't do all the cleanup at once.
Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> --- merge-recursive.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index db8833675e..be20660527 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1667,6 +1667,12 @@ struct rename_info { struct string_list *merge_renames; }; +static void initial_cleanup_rename(struct diff_queue_struct *pairs) +{ + free(pairs->queue); + free(pairs); +} + static int handle_renames(struct merge_options *o, struct tree *common, struct tree *head, @@ -1697,16 +1703,13 @@ static int handle_renames(struct merge_options *o, * data structures are still needed and referenced in * process_entry(). But there are a few things we can free now. */ - - free(head_pairs->queue); - free(head_pairs); - free(merge_pairs->queue); - free(merge_pairs); + initial_cleanup_rename(head_pairs); + initial_cleanup_rename(merge_pairs); return clean; } -static void cleanup_rename(struct string_list *rename) +static void final_cleanup_rename(struct string_list *rename) { const struct rename *re; int i; @@ -1722,10 +1725,10 @@ static void cleanup_rename(struct string_list *rename) free(rename); } -static void cleanup_renames(struct rename_info *re_info) +static void final_cleanup_renames(struct rename_info *re_info) { - cleanup_rename(re_info->head_renames); - cleanup_rename(re_info->merge_renames); + final_cleanup_rename(re_info->head_renames); + final_cleanup_rename(re_info->merge_renames); } static struct object_id *stage_oid(const struct object_id *oid, unsigned mode) @@ -2128,7 +2131,7 @@ int merge_trees(struct merge_options *o, } cleanup: - cleanup_renames(&re_info); + final_cleanup_renames(&re_info); string_list_clear(entries, 1); free(entries);
-- 2.16.1.232.g28d5be9217