[PATCH 3/5] parse-options.c: use optbug() instead of BUG() "opts" check
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- May 21, 2022, 17:14 UTC
- Message-ID
- <patch-3.5-5a3e7609854-20220521T170939Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.5-00000000000-20220521T170939Z-avarab@gmail.com>
Change the assertions added in bf3ff338a25 (parse-options: stop abusing 'callback' for lowlevel callbacks, 2019-01-27) to use optbug() instead of BUG(). At this point we're looping over individual options, so if we encounter any issues we'd like to report the offending option.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- parse-options.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/parse-options.c b/parse-options.c index 7fff588a45f..5875936898f 100644 --- a/parse-options.c +++ b/parse-options.c @@ -474,20 +474,20 @@ static void parse_options_check(const struct option *opts) break; case OPTION_CALLBACK: if (!opts->callback && !opts->ll_callback) - BUG("OPTION_CALLBACK needs one callback"); + optbug(opts, "OPTION_CALLBACK needs one callback"); if (opts->callback && opts->ll_callback) - BUG("OPTION_CALLBACK can't have two callbacks"); + optbug(opts, "OPTION_CALLBACK can't have two callbacks"); break; case OPTION_LOWLEVEL_CALLBACK: if (!opts->ll_callback) - BUG("OPTION_LOWLEVEL_CALLBACK needs a callback"); + optbug(opts, "OPTION_LOWLEVEL_CALLBACK needs a callback"); if (opts->callback) - BUG("OPTION_LOWLEVEL_CALLBACK needs no high level callback"); + optbug(opts, "OPTION_LOWLEVEL_CALLBACK needs no high level callback"); break; case OPTION_ALIAS: - BUG("OPT_ALIAS() should not remain at this point. " - "Are you using parse_options_step() directly?\n" - "That case is not supported yet."); + optbug(opts, "OPT_ALIAS() should not remain at this point. " + "Are you using parse_options_step() directly?\n" + "That case is not supported yet."); default: ; /* ok. (usually accepts an argument) */ }
-- 2.36.1.960.g7a4e2fc85c9