Re: [PATCH 1/2] merge-recursive: Workaround unused variable warning

From

Jonathan Nieder <jrnieder@gmail.com>

Date

Aug 18, 2010, 00:10 UTC

Message-ID

<20100818001032.GA7694@burratino>

In-Reply-To

<AANLkTikLXy4gPttmX=wzcDaFAfZO=OEk4PEDKh3sCSOF@mail.gmail.com>

Elijah Newren wrote:

> On Thu, Aug 12, 2010 at 8:09 PM, Elijah Newren <newren@gmail.com> wrote:

>> +++ b/merge-recursive.c
>> @@ -1214,6 +1214,7 @@ static int process_df_entry(struct merge_options *o,
>>        /* We currently only handle D->F cases */
>>        assert((!o_sha && a_sha && !b_sha) ||
>>               (!o_sha && !a_sha && b_sha));
>> +       (void)o_sha;

[...]

>                        would a different method of fixing warnings
> when NDEBUG is defined be preferred?  (Maybe changing the
> "assert(foo)" into "if (!foo) die..." instead?)