[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] svn/conflict-callbacks.c indentation fix

From: Joe Orton <jorton_at_redhat.com>
Date: Fri, 2 Nov 2018 09:39:47 +0000

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?

[[[
* subversion/svn/conflict-callbacks.c
  (build_tree_conflict_options): No functional change; fix
  indentation to avoid gcc -Wmisleading-indentation warning.
]]]

Received on 2018-11-02 10:40:05 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.