From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH 2/3] revision.c: use skip_prefix() in handle_revision_opt()
Date: Fri, 2 Jun 2017 16:11:43 -0400 [thread overview]
Message-ID: <20170602201143.6avkhp224no3dukb@sigill.intra.peff.net> (raw)
In-Reply-To: <20170602191010.16834-3-szeder.dev@gmail.com>
On Fri, Jun 02, 2017 at 09:10:09PM +0200, SZEDER Gábor wrote:
> @@ -1785,15 +1785,15 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
> } else if (!strcmp(arg, "--author-date-order")) {
> revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
> revs->topo_order = 1;
> - } else if (starts_with(arg, "--early-output")) {
> + } else if (skip_prefix(arg, "--early-output", &optarg)) {
> int count = 100;
> - switch (arg[14]) {
> + switch (*optarg) {
> case '=':
> - count = atoi(arg+15);
> + count = atoi(optarg + 1);
> /* Fallthrough */
> case 0:
> revs->topo_order = 1;
> - revs->early_output = count;
> + revs->early_output = count;
> }
What happens if I say "--early-output-foobar"? There should probably be
a "default" here that rejects it. Though we'd probably to goto to get to
the unknown block, yuck.
Perhaps we could do:
if (skip_prefix(arg, "--early-output", &optarg) &&
(*optarg == '=' || !*optarg)) {
int count = *optarg ? atoi(optarg + 1) : 100;
revs->topo_order = 1;
revs->early_output = count;
}
Alternatively, a helper like:
int match_opt(const char *have, const char *want, const char **argout)
{
const char *arg;
if (!skip_prefix(have, want, &arg))
return 0;
if (!*arg)
*argout = NULL;
else if (*arg == '=')
*argout = arg + 1;
else
return 0;
return 1;
}
would let us do:
if (match_opt(arg, "--early-output"), &optarg)) {
int count = optarg ? atoi(optarg) : 100;
...
}
which is a little nicer and could maybe help other options (I didn't see
any, though). If we're going to go that route, though, I suspect there
may be some helpers we already have. Looks like parse_long_opt() is
almost there, but doesn't handle options. I wonder if we could reuse
bits of parse-options here (or even better, just parse-optify many of
these).
Anyway, none of that is caused by your patch, but at least doing the
minimal fix (my first hunk) seems like it fits into your series.
-Peff
next prev parent reply other threads:[~2017-06-02 20:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 19:10 [PATCH 0/3] Use skip_prefix() in handle_revision_{,pseudo_}opt() SZEDER Gábor
2017-06-02 19:10 ` [PATCH 1/3] revision.c: stricter parsing of '--no-{min,max}-parents' SZEDER Gábor
2017-06-02 19:10 ` [PATCH 2/3] revision.c: use skip_prefix() in handle_revision_opt() SZEDER Gábor
2017-06-02 20:11 ` Jeff King [this message]
2017-06-02 20:15 ` Jeff King
2017-06-09 18:17 ` SZEDER Gábor
2017-06-09 18:17 ` [PATCHv2 1/5] revision.h: turn rev_info.early_output back into an unsigned int SZEDER Gábor
2017-06-10 6:41 ` Jeff King
2017-06-10 11:41 ` [PATCHv2.1] " SZEDER Gábor
2017-06-12 21:30 ` Jeff King
2017-06-12 20:36 ` [PATCHv2 1/5] " Junio C Hamano
2017-06-12 21:59 ` Jeff King
2017-06-13 0:50 ` Jeff King
2017-06-09 18:17 ` [PATCHv2 2/5] revision.c: stricter parsing of '--no-{min,max}-parents' SZEDER Gábor
2017-06-09 18:17 ` [PATCHv2 3/5] revision.c: stricter parsing of '--early-output' SZEDER Gábor
2017-06-10 4:52 ` Junio C Hamano
2017-06-09 18:17 ` [PATCHv2 4/5] revision.c: use skip_prefix() in handle_revision_opt() SZEDER Gábor
2017-06-09 18:17 ` [PATCHv2 5/5] revision.c: use skip_prefix() in handle_revision_pseudo_opt() SZEDER Gábor
2017-06-10 6:35 ` [PATCH 2/3] revision.c: use skip_prefix() in handle_revision_opt() Jeff King
2017-06-10 6:44 ` Jeff King
2017-06-02 19:10 ` [PATCH 3/3] revision.c: use skip_prefix() in handle_revision_pseudo_opt() SZEDER Gábor
2017-06-02 20:17 ` [PATCH 0/3] Use skip_prefix() in handle_revision_{,pseudo_}opt() Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170602201143.6avkhp224no3dukb@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).