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

parse-options: add precision handling for OPTION_NEGBIT

Browse Source 
Similar to 09705696f7 (parse-options: introduce precision handling for
`OPTION_INTEGER`, 2025-04-17) support value variables of different sizes
for OPTION_NEGBIT.  Do that by requiring their "precision" to be set,
casting their "value" pointer accordingly and checking whether the value
fits.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2025-07-09 11:45:53 +02:00
committed by Junio C Hamano
parent 5228211c4b
commit feeebbf1b7
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/rebase.c
View File

@@ -1128,6 +1128,7 @@ int cmd_rebase(int argc,
.short_name = 'n', .short_name = 'n',
.long_name = "no-stat", .long_name = "no-stat",
.value = &options.flags, .value = &options.flags,
.precision = sizeof(options.flags),
.help = N_("do not show diffstat of what changed upstream"), .help = N_("do not show diffstat of what changed upstream"),
.flags = PARSE_OPT_NOARG, .flags = PARSE_OPT_NOARG,
.defval = REBASE_DIFFSTAT, .defval = REBASE_DIFFSTAT,

11
parse-options.c
View File

@@ -157,11 +157,14 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p,
} }
case OPTION_NEGBIT: case OPTION_NEGBIT:
{
intmax_t value = get_int_value(opt, flags);
if (unset) if (unset)
*(int *)opt->value |= opt->defval; value |= opt->defval;
else else
*(int *)opt->value &= ~opt->defval; value &= ~opt->defval;
return 0; return set_int_value(opt, flags, value);
}
case OPTION_BITOP: case OPTION_BITOP:
if (unset) if (unset)
@@ -643,11 +646,11 @@ static void parse_options_check(const struct option *opts)
switch (opts->type) { switch (opts->type) {
case OPTION_SET_INT: case OPTION_SET_INT:
case OPTION_BIT: case OPTION_BIT:
case OPTION_NEGBIT:
if (!signed_int_fits(opts->defval, opts->precision)) if (!signed_int_fits(opts->defval, opts->precision))
optbug(opts, "has invalid defval"); optbug(opts, "has invalid defval");
/* fallthru */ /* fallthru */
case OPTION_COUNTUP: case OPTION_COUNTUP:
case OPTION_NEGBIT:
case OPTION_NUMBER: case OPTION_NUMBER:
case OPTION_BITOP: case OPTION_BITOP:
if ((opts->flags & PARSE_OPT_OPTARG) || if ((opts->flags & PARSE_OPT_OPTARG) ||

1
parse-options.h
View File

@@ -250,6 +250,7 @@ struct option {
.short_name = (s), \ .short_name = (s), \
.long_name = (l), \ .long_name = (l), \
.value = (v), \ .value = (v), \
.precision = sizeof(*v), \
.help = (h), \ .help = (h), \
.flags = PARSE_OPT_NOARG, \ .flags = PARSE_OPT_NOARG, \
.defval = (b), \ .defval = (b), \