Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / builtin / clean.c

diff --git a/builtin/clean.c b/builtin/clean.c
index 5a9c29a558bb1efc383b41256972b3113845be4e..e53ea52d89bbb473e26666e453d549e6720a9cc2 100644 (file)
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -667,7 +667,7 @@ static int filter_by_patterns_cmd(void)
                if (!confirm.len)
                        break;
 
-               memset(&dir, 0, sizeof(dir));
+               dir_init(&dir);
                pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude");
                ignore_list = strbuf_split_max(&confirm, ' ', 0);
 
@@ -698,7 +698,7 @@ static int filter_by_patterns_cmd(void)
                }
 
                strbuf_list_free(ignore_list);
-               clear_directory(&dir);
+               dir_clear(&dir);
        }
 
        strbuf_release(&confirm);
@@ -923,7 +923,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        argc = parse_options(argc, argv, prefix, options, builtin_clean_usage,
                             0);
 
-       memset(&dir, 0, sizeof(dir));
+       dir_init(&dir);
        if (!interactive && !dry_run && !force) {
                if (config_set)
                        die(_("clean.requireForce set to true and neither -i, -n, nor -f given; "
@@ -1021,11 +1021,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                string_list_append(&del_list, rel);
        }
 
-       for (i = 0; i < dir.nr; i++)
-               free(dir.entries[i]);
-
-       for (i = 0; i < dir.ignored_nr; i++)
-               free(dir.ignored[i]);
+       dir_clear(&dir);
 
        if (interactive && del_list.nr > 0)
                interactive_main_loop();