subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Branko Čibej <br...@apache.org>
Subject Re: [PATCH] svn/conflict-callbacks.c indentation fix
Date Fri, 02 Nov 2018 09:49:23 GMT
On 02.11.2018 10:44, Stefan Sperling wrote:
> On Fri, Nov 02, 2018 at 09:39:47AM +0000, Joe Orton wrote:
>> There are two gcc 8.x (I'm using 8.2.1) warnings from which catch those:
>>
>>   if (foo) 
>>     bar;
>>     baz;
>>
>> type of errors.  I fixed one case which looks obviously like a false 
>> positive in r1845556, but I'm not sure about the other one, in this 
>> code:
>>
>> http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?view=markup#l1528
>>
>> The warning is:
>>
>> subversion/svn/conflict-callbacks.c: In function ‘build_tree_conflict_options’:
>> subversion/svn/conflict-callbacks.c:1531:7: warning: this ‘if’ clause does not
guard... [-Wmisleading-indentation]
>>        if (all_options_are_dumb != NULL &&
>>        ^~
>> subversion/svn/conflict-callbacks.c:1537:9: note: ...this statement, but the latter
is misleadingly indented as if it were guarded by the ‘if’
>>          if (*possible_moved_to_repos_relpaths == NULL)
>>
>> Can someone familiar with the code check whether it's OK?
> Hi Joe,
>
> I confirm that your patch is correct. I mis-indented these blocks.

Time to start using a real editor, I guess? :)

-- Brane


Mime
View raw message