From 8865859dfc346c61f0e75fa429c5d307bd27368c Mon Sep 17 00:00:00 2001 From: Olga Telezhnaya Date: Sat, 30 Sep 2017 17:51:01 +0000 Subject: mru: use double-linked list from list.h Simplify mru.[ch] and related code by reusing the double-linked list implementation from list.h instead of a custom one. This commit is an intermediate step. Our final goal is to get rid of mru.[ch] at all and inline all logic. Mentored-by: Christian Couder Mentored by: Jeff King Signed-off-by: Olga Telezhnaia Signed-off-by: Junio C Hamano --- builtin/pack-objects.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'builtin/pack-objects.c') diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index f721137eaf..ba812349e0 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -995,8 +995,8 @@ static int want_object_in_pack(const unsigned char *sha1, struct packed_git **found_pack, off_t *found_offset) { - struct mru_entry *entry; int want; + struct list_head *pos; if (!exclude && local && has_loose_object_nonlocal(sha1)) return 0; @@ -1012,7 +1012,8 @@ static int want_object_in_pack(const unsigned char *sha1, return want; } - for (entry = packed_git_mru.head; entry; entry = entry->next) { + list_for_each(pos, &packed_git_mru.list) { + struct mru *entry = list_entry(pos, struct mru, list); struct packed_git *p = entry->item; off_t offset; -- cgit v1.2.1