From 43888a796d031a3382c3477557ef248b10c973de Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 18 Jan 2014 13:16:59 -0600 Subject: [PATCH 1/1] extract.c: Combine {do_,}dentry_delete_from_list() --- src/extract.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/extract.c b/src/extract.c index 623fbf7c..98ccccad 100644 --- a/src/extract.c +++ b/src/extract.c @@ -1658,17 +1658,11 @@ dentry_reset_extraction_list_node(struct wim_dentry *dentry) dentry->extraction_list = (struct list_head){NULL, NULL}; } -static void -dentry_delete_from_list(struct wim_dentry *dentry) +static int +dentry_delete_from_list(struct wim_dentry *dentry, void *_ignore) { list_del(&dentry->extraction_list); dentry_reset_extraction_list_node(dentry); -} - -static int -do_dentry_delete_from_list(struct wim_dentry *dentry, void *_ignore) -{ - dentry_delete_from_list(dentry); return 0; } @@ -1885,7 +1879,7 @@ out_replace: return 0; skip_dentry: - for_dentry_in_tree(dentry, do_dentry_delete_from_list, NULL); + for_dentry_in_tree(dentry, dentry_delete_from_list, NULL); return 0; } -- 2.43.0