From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Miriam Rubio <mirucam@gmail.com>
Cc: git@vger.kernel.org, Tanushree Tumane <tanushreetumane@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH v2 05/11] bisect--helper: introduce new `decide_next()` function
Date: Thu, 30 Jan 2020 13:31:44 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2001301330070.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200128144026.53128-6-mirucam@gmail.com>
Hi Miriam,
On Tue, 28 Jan 2020, Miriam Rubio wrote:
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index 21de5c096c..826fcba2ed 100644
> --- a/builtin/bisect--helper.c
> +++ b/builtin/bisect--helper.c
> @@ -291,26 +291,14 @@ static const char need_bisect_start_warning[] =
> "You then need to give me at least one %s and %s revision.\n"
> "You can use \"git bisect %s\" and \"git bisect %s\" for that.");
>
> -static int bisect_next_check(const struct bisect_terms *terms,
> - const char *current_term)
> +static int decide_next(const struct bisect_terms *terms,
> + const char *current_term, int missing_good,
> + int missing_bad)
> {
> - int missing_good = 1, missing_bad = 1, res = 0;
> - const char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
> - const char *good_glob = xstrfmt("%s-*", terms->term_good);
> -
> - if (ref_exists(bad_ref))
> - missing_bad = 0;
> -
> - for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
> - (void *) &missing_good);
> -
> if (!missing_good && !missing_bad)
> - goto finish;
> -
> - if (!current_term) {
> - res = -1;
> - goto finish;
> - }
> + return 0;
> + if (!current_term)
> + return -1;
> [...]
> +
> +static int bisect_next_check(const struct bisect_terms *terms,
> + const char *current_term)
> +{
> + int missing_good = 1, missing_bad = 1;
> + const char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
> + const char *good_glob = xstrfmt("%s-*", terms->term_good);
> +
> + if (ref_exists(bad_ref))
> + missing_bad = 0;
> +
> + for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
> + (void *) &missing_good);
> +
> free((void *) good_glob);
> free((void *) bad_ref);
I know this is not something you introduced, but while you are already in
the neighborhood, why not fix the types of `bad_ref` and `good_glob`? The
`xstrfmt()` function returns `char *` for a reason: so that you do not
have to cast it when `free()`ing the memory.
Thanks,
Dscho
> - return res;
> +
> + return decide_next(terms, current_term, missing_good, missing_bad);
> }
>
> static int get_terms(struct bisect_terms *terms)
> --
> 2.21.1 (Apple Git-122.3)
>
>
next prev parent reply other threads:[~2020-01-30 12:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-28 14:40 [Outreachy][PATCH v2 00/11] Finish converting git bisect to C part 1 Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 01/11] bisect--helper: convert `vocab_*` char pointers to char arrays Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 02/11] bisect--helper: change `retval` to `res` Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 03/11] bisect: use the standard 'if (!var)' way to check for 0 Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 04/11] run-command: make `exists_in_PATH()` non-static Miriam Rubio
2020-01-30 12:36 ` Johannes Schindelin
[not found] ` <CAN7CjDCiG6KZU+yHGxQ26TESb1yfvc7aWh0EKhE=owSV7D-C0Q@mail.gmail.com>
2020-01-30 14:41 ` Fwd: " Miriam R.
2020-01-28 14:40 ` [PATCH v2 05/11] bisect--helper: introduce new `decide_next()` function Miriam Rubio
2020-01-30 12:31 ` Johannes Schindelin [this message]
2020-01-30 14:05 ` Miriam R.
2020-01-28 14:40 ` [PATCH v2 06/11] bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents Miriam Rubio
2020-01-31 18:22 ` Junio C Hamano
2020-01-28 14:40 ` [PATCH v2 07/11] bisect: libify `bisect_checkout` Miriam Rubio
2020-01-31 18:31 ` Junio C Hamano
2020-01-28 14:40 ` [PATCH v2 08/11] bisect: libify `check_merge_bases` and its dependents Miriam Rubio
2020-01-31 18:40 ` Junio C Hamano
2020-01-28 14:40 ` [PATCH v2 09/11] bisect: libify `check_good_are_ancestors_of_bad` " Miriam Rubio
2020-01-30 13:46 ` Johannes Schindelin
2020-01-30 14:40 ` Miriam R.
2020-01-30 15:01 ` Johannes Schindelin
2020-01-30 15:26 ` Miriam R.
2020-01-30 21:59 ` Christian Couder
2020-01-31 9:07 ` Johannes Schindelin
2020-01-31 9:15 ` Christian Couder
[not found] ` <CAN7CjDC7ijMDtJdShRB+P0d0GRYYrQXktdH2Og9XGDqJ-OZxzw@mail.gmail.com>
2020-01-31 10:21 ` Fwd: " Miriam R.
2020-01-28 14:40 ` [PATCH v2 10/11] bisect: libify `handle_bad_merge_base` " Miriam Rubio
2020-01-28 14:40 ` [PATCH v2 11/11] bisect: libify `bisect_next_all` Miriam Rubio
2020-01-30 15:04 ` [Outreachy][PATCH v2 00/11] Finish converting git bisect to C part 1 Johannes Schindelin
2020-01-30 15:18 ` Miriam R.
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=nycvar.QRO.7.76.6.2001301330070.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=mirucam@gmail.com \
--cc=tanushreetumane@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).