From c671d4b5990f07ca40b0914ca9be65c626608fca Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 19 Jul 2018 11:56:19 -0700 Subject: xdiff/xhistogram: factor out memory cleanup into free_index() This will be useful in the next patch as we'll introduce multiple callers. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index 6e20f75..5098b6c 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -243,6 +243,14 @@ static int fall_back_to_classic_diff(xpparam_t const *xpp, xdfenv_t *env, line1, count1, line2, count2); } +static inline void free_index(struct histindex *index) +{ + xdl_free(index->records); + xdl_free(index->line_map); + xdl_free(index->next_ptrs); + xdl_cha_free(&index->rcha); +} + static int find_lcs(struct histindex *index, struct region *lcs, int line1, int count1, int line2, int count2) { int b_ptr; @@ -343,10 +351,7 @@ static int histogram_diff(xpparam_t const *xpp, xdfenv_t *env, } cleanup: - xdl_free(index.records); - xdl_free(index.line_map); - xdl_free(index.next_ptrs); - xdl_cha_free(&index.rcha); + free_index(&index); return result; } -- cgit v0.10.2-6-g49f6