Re: [PATCH 2/2] grep: use grep_and_expr() in compile_pattern_and()

From: Taylor Blau <me@ttaylorr.com>
Date: Jan 6, 2022, 22:43 UTC
Message-ID: <YddwijcMrmkgJNmD@nand.local>
In-Reply-To: <xmqqlezsbjfs.fsf@gitster.g>

On Thu, Jan 06, 2022 at 02:14:47PM -0800, Junio C Hamano wrote:

Show 14 quoted lines

> Taylor Blau <me@ttaylorr.com> writes:
> > @@ -687,11 +692,7 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list)
> >  		y = compile_pattern_and(list);
> >  		if (!y)
> >  			die("--and not followed by pattern expression");
> > -		CALLOC_ARRAY(z, 1);
> > -		z->node = GREP_NODE_AND;
> > -		z->u.binary.left = x;
> > -		z->u.binary.right = y;
> > -		return z;
> > +		return grep_and_expr(x, y);
>
> You'd need to remove 'z' from the function to avoid getting yelled
> at by your compiler for unused variable.

How embarrassing :-). Thanks for noticing, I wrote this so hastily I neglected to even compile it with DEVELOPER=1.

The new version I sent in response fixes this issue.

Thanks, Taylor