From: Eric Sunshine <sunshine@sunshineco.com>
To: Pranit Bauva <pranit.bauva@gmail.com>
Cc: "Git List" <git@vger.kernel.org>,
"Christian Couder" <christian.couder@gmail.com>,
"Christian Couder" <chriscool@tuxfamily.org>,
"Lars Schneider" <larsxschneider@gmail.com>,
"Torsten Bögershausen" <tboegi@web.de>
Subject: Re: [PATCH v2 5/6] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
Date: Wed, 15 Jun 2016 17:14:48 -0400 [thread overview]
Message-ID: <CAPig+cRNcg496Ty2SJ1ojm1n3OpHzX0obMAD2bY3AzoyrKdA9w@mail.gmail.com> (raw)
In-Reply-To: <20160615140026.10519-6-pranit.bauva@gmail.com>
On Wed, Jun 15, 2016 at 10:00 AM, Pranit Bauva <pranit.bauva@gmail.com> wrote:
> Reimplement `is_expected_rev` & `check_expected_revs` shell function in
> C and add a `--check-expected-revs` subcommand to `git bisect--helper` to
> call it from git-bisect.sh .
> [...]
> Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
> ---
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> @@ -162,13 +162,44 @@ static int bisect_reset(const char *commit)
> +static int is_expected_rev(const char *expected_hex)
> +{
> + struct strbuf actual_hex = STRBUF_INIT;
> + int res;
> +
> + if (strbuf_read_file(&actual_hex, git_path_bisect_expected_rev(), 0) < 0) {
> + strbuf_release(&actual_hex);
> + return 0;
> + }
> +
> + strbuf_trim(&actual_hex);
> + res = !strcmp(actual_hex.buf, expected_hex);
> + strbuf_release(&actual_hex);
> + return res;
> +}
Not worth a re-roll, but this could be re-structured to avoid having
to remember to release the strbuf at all exits:
struct strbuf actual_hex = ...;
int res = 0;
if (strbuf_read_file(...) >= 0) {
strbuf_trim(...);
res = !strcmp(...);
}
strbuf_release(...);
return res;
Alternately:
if (strbuf_read_file(...) < 0)
goto done;
strbuf_trim(...);
res = !strcmp(...);
done:
strbuf_release(...);
return res;
which is a bit less compact.
> +static int check_expected_revs(const char **revs, int rev_nr)
> +{
> + int i;
> +
> + for (i = 0; i < rev_nr; i++) {
> + if (!is_expected_rev(revs[i])) {
> + remove_path(git_path_bisect_ancestors_ok());
> + remove_path(git_path_bisect_expected_rev());
> + return 0;
> + }
> + }
> + return 0;
> +}
Hmm, all execution paths return 0, so it feels a bit pointless to have
this function return a value at all.
You could also use a 'break' inside the loop rather than 'return'
since the return value is the same inside or outside the loop and
nothing else happens after the loop.
next prev parent reply other threads:[~2016-06-15 21:14 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 20:54 [PATCH 1/4] bisect--helper: `bisect_clean_state` shell function in C Pranit Bauva
2016-06-07 20:54 ` [PATCH 2/4] t6030: explicitly test for bisection cleanup Pranit Bauva
2016-06-07 23:21 ` Eric Sunshine
2016-06-08 8:07 ` Pranit Bauva
2016-06-08 8:17 ` Eric Sunshine
2016-06-08 10:20 ` Pranit Bauva
2016-06-07 20:54 ` [PATCH 3/4] dir: introduce file_size() to check the size of file Pranit Bauva
2016-06-08 7:37 ` Eric Sunshine
2016-06-08 7:57 ` Pranit Bauva
2016-06-08 8:13 ` Eric Sunshine
2016-06-08 10:03 ` Christian Couder
2016-06-08 8:17 ` Torsten Bögershausen
2016-06-08 13:08 ` Pranit Bauva
2016-06-12 10:44 ` Torsten Bögershausen
2016-06-13 6:21 ` Pranit Bauva
2016-06-07 20:54 ` [PATCH 4/4] bisect--helper: `bisect_reset` shell function in C Pranit Bauva
2016-06-08 7:59 ` Eric Sunshine
2016-06-08 9:51 ` Christian Couder
2016-06-08 9:53 ` Christian Couder
2016-06-08 17:50 ` Eric Sunshine
2016-06-08 13:20 ` Pranit Bauva
2016-06-08 17:53 ` Eric Sunshine
2016-06-08 18:04 ` Pranit Bauva
2016-06-07 22:31 ` [PATCH 1/4] bisect--helper: `bisect_clean_state` " Eric Sunshine
2016-06-08 1:51 ` Eric Sunshine
2016-06-08 7:46 ` Pranit Bauva
2016-06-08 8:02 ` Eric Sunshine
2016-06-08 8:09 ` Pranit Bauva
2016-06-08 9:41 ` Christian Couder
2016-06-08 17:59 ` Eric Sunshine
2016-06-08 18:04 ` Pranit Bauva
2016-06-15 14:00 ` [PATCH v2 0/6] convert various shell functions in git-bisect to C Pranit Bauva
2016-06-15 14:00 ` [PATCH v2 1/6] bisect--helper: `bisect_clean_state` shell function in C Pranit Bauva
2016-06-15 18:04 ` Eric Sunshine
2016-06-15 18:47 ` Pranit Bauva
2016-06-15 20:22 ` Eric Sunshine
2016-06-15 14:00 ` [PATCH v2 2/6] t6030: explicitly test for bisection cleanup Pranit Bauva
2016-06-15 14:00 ` [PATCH v2 3/6] wrapper: move is_empty_file() from builtin/am.c Pranit Bauva
2016-06-15 18:12 ` Junio C Hamano
2016-06-15 18:15 ` Pranit Bauva
2016-06-15 18:22 ` Eric Sunshine
2016-06-15 18:40 ` Pranit Bauva
2016-06-15 14:00 ` [PATCH v2 4/6] bisect--helper: `bisect_reset` shell function in C Pranit Bauva
2016-06-15 21:05 ` Eric Sunshine
2016-06-16 19:06 ` Pranit Bauva
2016-06-15 14:00 ` [PATCH v2 5/6] bisect--helper: `is_expected_rev` & `check_expected_revs` " Pranit Bauva
2016-06-15 21:14 ` Eric Sunshine [this message]
2016-06-16 19:05 ` Pranit Bauva
2016-06-16 19:16 ` Eric Sunshine
2016-06-16 19:25 ` Pranit Bauva
2016-06-16 20:47 ` Christian Couder
2016-06-17 12:49 ` Pranit Bauva
2016-06-15 14:00 ` [PATCH v2 6/6] bisect--helper: `bisect_write` " Pranit Bauva
2016-06-16 18:55 ` Eric Sunshine
2016-06-16 19:01 ` Pranit Bauva
2016-06-16 20:38 ` Christian Couder
2016-06-17 13:10 ` Pranit Bauva
2016-06-15 17:53 ` [PATCH v2 0/6] convert various shell functions in git-bisect to C Eric Sunshine
2016-06-15 18:09 ` Pranit Bauva
2016-06-26 12:23 ` [PATCH v3 " Pranit Bauva
2016-07-06 20:25 ` [PATCH v4 " Pranit Bauva
2016-07-06 20:25 ` [PATCH v4 1/6] bisect--helper: `bisect_clean_state` shell function in C Pranit Bauva
2016-07-06 20:25 ` [PATCH v4 2/6] t6030: explicitly test for bisection cleanup Pranit Bauva
2016-07-11 19:16 ` Junio C Hamano
2016-07-06 20:25 ` [PATCH v4 3/6] wrapper: move is_empty_file() and rename it as is_empty_or_missing_file() Pranit Bauva
2016-07-06 20:25 ` [PATCH v4 4/6] bisect--helper: `bisect_reset` shell function in C Pranit Bauva
2016-07-06 20:25 ` [PATCH v4 5/6] bisect--helper: `is_expected_rev` & `check_expected_revs` " Pranit Bauva
2016-07-06 20:25 ` [PATCH v4 6/6] bisect--helper: `bisect_write` " Pranit Bauva
2016-07-11 19:19 ` [PATCH v4 0/6] convert various shell functions in git-bisect to C Junio C Hamano
2016-06-26 12:23 ` [PATCH v3 1/6] bisect--helper: `bisect_clean_state` shell function in C Pranit Bauva
2016-06-26 12:23 ` [PATCH v3 2/6] t6030: explicitly test for bisection cleanup Pranit Bauva
2016-06-26 12:23 ` [PATCH v3 3/6] wrapper: move is_empty_file() and rename it as is_empty_or_missing_file() Pranit Bauva
2016-06-26 12:23 ` [PATCH v3 4/6] bisect--helper: `bisect_reset` shell function in C Pranit Bauva
2016-06-26 12:23 ` [PATCH v3 5/6] bisect--helper: `is_expected_rev` & `check_expected_revs` " Pranit Bauva
2016-06-26 12:23 ` [PATCH v3 6/6] bisect--helper: `bisect_write` " Pranit Bauva
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=CAPig+cRNcg496Ty2SJ1ojm1n3OpHzX0obMAD2bY3AzoyrKdA9w@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=larsxschneider@gmail.com \
--cc=pranit.bauva@gmail.com \
--cc=tboegi@web.de \
/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).