Re: [PATCH v3 21/24] merge-recursive: split internal fields into a separate struct

From: Elijah Newren <newren@gmail.com>
Date: Aug 16, 2019, 23:00 UTC
Message-ID: <CABPp-BHcrfMYOxJXAke5R3nq2hqJVupmOCNv5NnWoLT3W=Odcg@mail.gmail.com>
In-Reply-To: <20190816211922.GS20404@szeder.dev>

On Fri, Aug 16, 2019 at 2:19 PM SZEDER Gábor <szeder.dev@gmail.com> wrote:

Show 18 quoted lines

>
> On Thu, Aug 15, 2019 at 02:40:50PM -0700, Elijah Newren wrote:
> > diff --git a/merge-recursive.c b/merge-recursive.c
>
> >  static void merge_finalize(struct merge_options *opt)
> >  {
> >       flush_output(opt);
> > -     if (!opt->call_depth && opt->buffer_output < 2)
> > +     if (!opt->priv->call_depth && opt->buffer_output < 2)
> >               strbuf_release(&opt->obuf);
> >       if (show(opt, 2))
> >               diff_warn_rename_limit("merge.renamelimit",
> > -                                    opt->needed_rename_limit, 0);
> > +                                    opt->priv->needed_rename_limit, 0);
> > +     free(opt->priv);
> > +     opt->priv = NULL;
>
> Coccinelle suggests FREE_AND_NULL(opt->priv) here.

Thanks; will fix.