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.
]]]
Index: subversion/svn/conflict-callbacks.c
===================================================================
--- subversion/svn/conflict-callbacks.c (revision 1845554)
+++ subversion/svn/conflict-callbacks.c (working copy)
@@ -1534,16 +1534,16 @@
id != svn_client_conflict_option_accept_current_wc_state)
*all_options_are_dumb = FALSE;
- if (*possible_moved_to_repos_relpaths == NULL)
- SVN_ERR(
- svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(
- possible_moved_to_repos_relpaths, builtin_option,
- result_pool, iterpool));
+ if (*possible_moved_to_repos_relpaths == NULL)
+ SVN_ERR(
+ svn_client_conflict_option_get_moved_to_repos_relpath_candidates2(
+ possible_moved_to_repos_relpaths, builtin_option,
+ result_pool, iterpool));
- if (*possible_moved_to_abspaths == NULL)
- SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates2(
- possible_moved_to_abspaths, builtin_option,
- result_pool, iterpool));
+ if (*possible_moved_to_abspaths == NULL)
+ SVN_ERR(svn_client_conflict_option_get_moved_to_abspath_candidates2(
+ possible_moved_to_abspaths, builtin_option,
+ result_pool, iterpool));
}
svn_pool_destroy(iterpool);
