git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] diffcore-pickaxe: simplify has_changes and contains
Date: Sun, 7 Jul 2013 00:03:37 -0400	[thread overview]
Message-ID: <20130707040337.GA30898@sigill.intra.peff.net> (raw)
In-Reply-To: <1373118807-1345-1-git-send-email-rene.scharfe@lsrfire.ath.cx>

On Sat, Jul 06, 2013 at 03:53:27PM +0200, René Scharfe wrote:

> Halve the number of callsites of contains() to two using temporary
> variables, simplifying the code.  While at it, get rid of the
> diff_options parameter, which became unused with 8fa4b09f.

There is a slight change in behavior, too:

> -	if (!one)
> -		return contains(two, o, regexp, kws) != 0;
> -	if (!two)
> -		return contains(one, o, regexp, kws) != 0;
> -	return contains(one, o, regexp, kws) != contains(two, o, regexp, kws);
> +	unsigned int one_contains = one ? contains(one, regexp, kws) : 0;
> +	unsigned int two_contains = two ? contains(two, regexp, kws) : 0;
> +	return one_contains != two_contains;

Before, if (!one && !two) we would call contains(two, ...), and now we
will simply assume it is zero. Which I think is an improvement, as we
would have segfaulted before. I don't think it is a bug in the current
code (we would not ever feed the function two NULLs), but it is nice to
be more defensive.

Acked-by: Jeff King <peff@peff.net>

-Peff

  reply	other threads:[~2013-07-07  4:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-06 13:53 [PATCH] diffcore-pickaxe: simplify has_changes and contains René Scharfe
2013-07-07  4:03 ` Jeff King [this message]
2013-07-07 17:25   ` Junio C Hamano

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=20130707040337.GA30898@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=rene.scharfe@lsrfire.ath.cx \
    /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).