From f92dd60f95c3e92bc1eac7a0810efae167df9b51 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 22 Aug 2016 17:57:58 -0400 Subject: [PATCH] release_delta_base_cache: reuse existing detach function This function drops an entry entirely from the cache, meaning that aside from the freeing of the buffer, it is exactly equivalent to detach_delta_base_cache_entry(). Let's build on top of the detach function, which shortens the code and will make it simpler when we change out the underlying storage in future patches. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- sha1_file.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 1d0810c30857b2..8264b391f03040 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2152,10 +2152,7 @@ static inline void release_delta_base_cache(struct delta_base_cache_entry *ent) { if (ent->data) { free(ent->data); - ent->data = NULL; - ent->lru.next->prev = ent->lru.prev; - ent->lru.prev->next = ent->lru.next; - delta_base_cached -= ent->size; + detach_delta_base_cache_entry(ent); } }