From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 18 Jan 2014 19:16:59 +0000 (-0600)
Subject: extract.c: Combine {do_,}dentry_delete_from_list()
X-Git-Tag: v1.6.1~2
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=43888a796d031a3382c3477557ef248b10c973de

extract.c: Combine {do_,}dentry_delete_from_list()
---

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;
 }