From: "René Scharfe" <l.s.r@web•de>
To: Patrick Steinhardt <ps@pks•im>
Cc: Git List <git@vger•kernel.org>
Subject: Re: [PATCH 6/6] parse-options: add precision handling for OPTION_COUNTUP
Date: Tue, 1 Jul 2025 18:01:44 +0200 [thread overview]
Message-ID: <591d618f-1b86-414c-8069-3621e00add74@web.de> (raw)
In-Reply-To: <aGO-nSyCN7OD9Zae@pks.im>
On 7/1/25 12:55 PM, Patrick Steinhardt wrote:
> On Sun, Jun 29, 2025 at 01:51:36PM +0200, René Scharfe wrote:
>> diff --git a/parse-options.c b/parse-options.c
>> index 0dc9b0324a..0dd08a3a77 100644
>> --- a/parse-options.c
>> +++ b/parse-options.c
>> @@ -166,10 +166,22 @@ static enum parse_opt_result do_get_value(struct parse_opt_ctx_t *p,
>> }
>>
>> case OPTION_COUNTUP:
>> - if (*(int *)opt->value < 0)
>> - *(int *)opt->value = 0;
>> - *(int *)opt->value = unset ? 0 : *(int *)opt->value + 1;
>> - return 0;
>> + {
>> + size_t bits = CHAR_BIT * opt->precision;
>> + intmax_t upper_bound = INTMAX_MAX >> (bitsizeof(intmax_t) - bits);
>> + intmax_t value = get_int_value(opt);
>> +
>> + if (value < 0)
>> + value = 0;
>> + if (unset)
>> + value = 0;
>> + else if (value < upper_bound)
>> + value++;
>> + else
>> + return error(_("value for %s exceeds %"PRIdMAX),
>> + optname(opt, flags), upper_bound);
>> + return set_int_value(opt, flags, value);
>> + }
>>
>> case OPTION_SET_INT:
>> return set_int_value(opt, flags, unset ? 0 : opt->defval);
>> @@ -630,10 +642,10 @@ static void parse_options_check(const struct option *opts)
>> case OPTION_BIT:
>> case OPTION_NEGBIT:
>> case OPTION_BITOP:
>> + case OPTION_COUNTUP:
>> if (!signed_int_fits(opts->defval, opts->precision))
>> optbug(opts, "has invalid defval");
>> /* fallthru */
>> - case OPTION_COUNTUP:
>> case OPTION_NUMBER:
>> if ((opts->flags & PARSE_OPT_OPTARG) ||
>> !(opts->flags & PARSE_OPT_NOARG))
>> diff --git a/parse-options.h b/parse-options.h
>> index 8bdf469ae9..312045604d 100644
>> --- a/parse-options.h
>> +++ b/parse-options.h
>> @@ -183,6 +183,7 @@ struct option {
>> .short_name = (s), \
>> .long_name = (l), \
>> .value = (v), \
>
> It's a bit surprising that `COUNTUP` accepts a signed integer, so should
> we maybe add `BARF_UNLESS_SIGNED(*(v))` here?
Perhaps, but that would require more changes to callers that use unsigned
variables than I can stomach. That's why I declared it out of scope for
this series in its cover letter. Later, unless (hopefully) someone beats
me to it.
>
>> + .precision = sizeof(*v), \
>> .help = (h), \
>> .flags = PARSE_OPT_NOARG|(f), \
>> }
>
> Patrick
next prev parent reply other threads:[~2025-07-01 16:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-29 11:43 [PATCH 0/6] parse-options: add more precision handling René Scharfe
2025-06-29 11:50 ` [PATCH 1/6] parse-options: add precision handling for PARSE_OPT_CMDMODE René Scharfe
2025-07-01 10:55 ` Patrick Steinhardt
2025-07-01 15:15 ` René Scharfe
2025-06-29 11:50 ` [PATCH 2/6] parse-options: add precision handling for OPTION_SET_INT René Scharfe
2025-07-01 10:55 ` Patrick Steinhardt
2025-07-01 15:54 ` René Scharfe
2025-07-02 2:31 ` Patrick Steinhardt
2025-06-29 11:50 ` [PATCH 3/6] parse-options: add precision handling for OPTION_BIT René Scharfe
2025-06-29 11:51 ` [PATCH 4/6] parse-options: add precision handling for OPTION_NEGBIT René Scharfe
2025-06-29 11:51 ` [PATCH 5/6] parse-options: add precision handling for OPTION_BITOP René Scharfe
2025-07-01 10:55 ` Patrick Steinhardt
2025-07-01 15:21 ` René Scharfe
2025-07-02 2:33 ` Patrick Steinhardt
2025-06-29 11:51 ` [PATCH 6/6] parse-options: add precision handling for OPTION_COUNTUP René Scharfe
2025-07-01 10:55 ` Patrick Steinhardt
2025-07-01 16:01 ` René Scharfe [this message]
2025-07-02 2:29 ` Patrick Steinhardt
2025-07-09 9:26 ` [PATCH v2 0/7] parse-options: add more precision handling René Scharfe
2025-07-09 9:44 ` [PATCH v2 1/7] parse-options: require PARSE_OPT_NOARG for OPTION_BITOP René Scharfe
2025-07-09 13:59 ` Patrick Steinhardt
2025-07-09 9:45 ` [PATCH v2 2/7] parse-options: add precision handling for PARSE_OPT_CMDMODE René Scharfe
2025-07-09 13:58 ` Patrick Steinhardt
2025-07-09 15:05 ` René Scharfe
2025-07-09 15:58 ` Patrick Steinhardt
2025-07-09 15:56 ` Junio C Hamano
2025-07-09 9:45 ` [PATCH v2 3/7] parse-options: add precision handling for OPTION_SET_INT René Scharfe
2025-07-09 9:45 ` [PATCH v2 4/7] parse-options: add precision handling for OPTION_BIT René Scharfe
2025-07-09 9:45 ` [PATCH v2 5/7] parse-options: add precision handling for OPTION_NEGBIT René Scharfe
2025-07-09 9:46 ` [PATCH v2 6/7] parse-options: add precision handling for OPTION_BITOP René Scharfe
2025-07-09 9:46 ` [PATCH v2 7/7] parse-options: add precision handling for OPTION_COUNTUP René Scharfe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=591d618f-1b86-414c-8069-3621e00add74@web.de \
--to=l.s.r@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=ps@pks$(echo .)im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox