Re: [PATCH 1/4] merge-recursive in C

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jul 3, 2006, 15:54 UTC
Message-ID: <Pine.LNX.4.63.0607031750310.29667@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20060703184604.59801e4e.tihirvon@gmail.com>

Hi,

On Mon, 3 Jul 2006, Timo Hirvonen wrote:

Show 9 quoted lines

> fork0@t-online.de (Alex Riesen) wrote:
> 
> > +/* in place */
> > +void path_list_union_update(struct path_list *dst, const struct path_list *src)
> > +{
> > +	char **new_paths;
> > +	int i = 0, j = 0, nr = 0, alloc = dst->nr + dst->nr;
> 
> It should be alloc = dst->nr + src->nr.

Good catch. Merci.

Ciao, Dscho