From e72445f8abbd4cf688ef6b0861765bc2f6e07adb Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Wed, 24 Mar 2010 13:09:59 -0400 Subject: [PATCH] res->buckets is always !NULL, so drop checks for it. SVN-Revision: 2054 --- libarchive/archive_entry_link_resolver.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/libarchive/archive_entry_link_resolver.c b/libarchive/archive_entry_link_resolver.c index 7b3bdc120..3311c8b4d 100644 --- a/libarchive/archive_entry_link_resolver.c +++ b/libarchive/archive_entry_link_resolver.c @@ -156,12 +156,9 @@ archive_entry_linkresolver_free(struct archive_entry_linkresolver *res) if (res == NULL) return; - if (res->buckets != NULL) { - while ((le = next_entry(res)) != NULL) - archive_entry_free(le->entry); - free(res->buckets); - res->buckets = NULL; - } + while ((le = next_entry(res)) != NULL) + archive_entry_free(le->entry); + free(res->buckets); free(res); } @@ -266,10 +263,6 @@ find_entry(struct archive_entry_linkresolver *res, res->spare = NULL; } - /* If the links cache overflowed and got flushed, don't bother. */ - if (res->buckets == NULL) - return (NULL); - dev = archive_entry_dev(entry); ino = archive_entry_ino64(entry); hash = (int)(dev ^ ino); @@ -318,10 +311,6 @@ next_entry(struct archive_entry_linkresolver *res) res->spare = NULL; } - /* If the links cache overflowed and got flushed, don't bother. */ - if (res->buckets == NULL) - return (NULL); - /* Look for next non-empty bucket in the links cache. */ for (bucket = 0; bucket < res->number_buckets; bucket++) { le = res->buckets[bucket]; -- 2.47.3