parse-options.c: add a parse_options_check_flags()

Add a parse_options_check_flags() for those checks that need to check
the "enum parse_opt_flags", or the "flags" and "opts" in combination.

This changes no behavior, and just moves existing code around, but in
a subsequent commit we'll start checking the per-option flags against
the parse_options() flags, this change makes that subsequent behavior
change smaller.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Author: avar

parse-options.c

@@ -452,6 +452,18 @@ static void check_typos(const char *arg, const struct option *options)
 	}
 }
 
+static void parse_options_check_flags(const struct option *opts,
+				      const enum parse_opt_flags flags)
+{
+	if ((flags & PARSE_OPT_KEEP_UNKNOWN) &&
+	    (flags & PARSE_OPT_STOP_AT_NON_OPTION) &&
+	    !(flags & PARSE_OPT_ONE_SHOT))
+		BUG("STOP_AT_NON_OPTION and KEEP_UNKNOWN don't go together");
+	if ((flags & PARSE_OPT_ONE_SHOT) &&
+	    (flags & PARSE_OPT_KEEP_ARGV0))
+		BUG("Can't keep argv0 if you don't have it");
+}
+
 static void parse_options_check(const struct option *opts)
 {
 	char short_opts[128];
@@ -530,13 +542,7 @@ static void parse_options_start_1(struct parse_opt_ctx_t *ctx,
 	ctx->prefix = prefix;
 	ctx->cpidx = ((flags & PARSE_OPT_KEEP_ARGV0) != 0);
 	ctx->flags = flags;
-	if ((flags & PARSE_OPT_KEEP_UNKNOWN) &&
-	    (flags & PARSE_OPT_STOP_AT_NON_OPTION) &&
-	    !(flags & PARSE_OPT_ONE_SHOT))
-		BUG("STOP_AT_NON_OPTION and KEEP_UNKNOWN don't go together");
-	if ((flags & PARSE_OPT_ONE_SHOT) &&
-	    (flags & PARSE_OPT_KEEP_ARGV0))
-		BUG("Can't keep argv0 if you don't have it");
+	parse_options_check_flags(options, flags);
 	parse_options_check(options);
 }