mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse-options: stop abusing 'callback' for lowlevel callbacks

Browse Source 
Lowlevel callbacks have different function signatures. Add a new field
in 'struct option' with the right type for lowlevel callbacks.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2019-01-27 07:35:26 +07:00
committed by Junio C Hamano
parent f62470c650
commit bf3ff338a2
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
parse-options.c
View File

@ -93,7 +93,7 @@ static int get_value(struct parse_opt_ctx_t *p,
switch (opt->type) {
case OPTION_LOWLEVEL_CALLBACK:
return (*(parse_opt_ll_cb *)opt->callback)(p, opt, unset);
return opt->ll_callback(p, opt, unset);
case OPTION_BIT:
if (unset)
@ -408,6 +408,19 @@ static void parse_options_check(const struct option *opts)
if ((opts->flags & PARSE_OPT_OPTARG) ||
!(opts->flags & PARSE_OPT_NOARG))
err |= optbug(opts, "should not accept an argument");
break;
case OPTION_CALLBACK:
if (!opts->callback)
BUG("OPTION_CALLBACK needs a callback");
if (opts->ll_callback)
BUG("OPTION_CALLBACK needs no ll_callback");
break;
case OPTION_LOWLEVEL_CALLBACK:
if (!opts->ll_callback)
BUG("OPTION_LOWLEVEL_CALLBACK needs a callback");
if (opts->callback)
BUG("OPTION_LOWLEVEL_CALLBACK needs no high level callback");
break;
default:
; /* ok. (usually accepts an argument) */
}