parse-options: add new function "usage_msg_opt"

diff --git a/builtin-clean.c b/builtin-clean.c
index 48bf29f40a5e06fd588b34c468535e04abcf206b..1c1b6d26e9987800d2a414e49e4f371a4277b96e 100644 (file)
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -31,11 +31,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        int i;
        int show_only = 0, remove_directories = 0, quiet = 0, ignored = 0;
        int ignored_only = 0, baselen = 0, config_set = 0, errors = 0;
-       struct strbuf directory;
+       struct strbuf directory = STRBUF_INIT;
        struct dir_struct dir;
        const char *path, *base;
        static const char **pathspec;
-       struct strbuf buf;
+       struct strbuf buf = STRBUF_INIT;
        const char *qname;
        char *seen = NULL;
        struct option options[] = {
@@ -56,12 +56,12 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        else
                config_set = 1;
 
-       argc = parse_options(argc, argv, options, builtin_clean_usage, 0);
+       argc = parse_options(argc, argv, prefix, options, builtin_clean_usage,
+                            0);
 
-       strbuf_init(&buf, 0);
        memset(&dir, 0, sizeof(dir));
        if (ignored_only)
-               dir.show_ignored = 1;
+               dir.flags |= DIR_SHOW_IGNORED;
 
        if (ignored && ignored_only)
                die("-x and -X cannot be used together");
@@ -70,7 +70,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
                die("clean.requireForce%s set and -n or -f not given; "
                    "refusing to clean", config_set ? "" : " not");
 
-       dir.show_other_directories = 1;
+       dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
 
        if (!ignored)
                setup_standard_excludes(&dir);
@@ -88,7 +88,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        if (baselen)
                path = base = xmemdupz(*pathspec, baselen);
        read_directory(&dir, path, base, baselen, pathspec);
-       strbuf_init(&directory, 0);
 
        if (pathspec)
                seen = xmalloc(argc > 0 ? argc : 1);