From: Ian Campbell <ian.campbell@citrix.com>
To: george.dunlap@citrix.com
Cc: Ian Campbell <ian.campbell@citrix.com>, xen-devel@lists.xen.org
Subject: [PATCH 1/2] xenalyze: fix misleading indentation.
Date: Fri, 22 Jan 2016 14:27:28 +0000 [thread overview]
Message-ID: <1453472849-25496-1-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1453472830.4320.97.camel@citrix.com>
gcc-6 adds -Wmisleading-indentation which found these issues.
xenalyze.c: In function 'weighted_percentile':
xenalyze.c:2136:18: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
L=I; L_weight = I_weight;
^~~~~~~~
xenalyze.c:2135:9: note: ...this 'if' clause, but it is not
if(J_weight<K_weight)
^~
xenalyze.c:2138:18: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
R=J; R_weight = J_weight;
^~~~~~~~
xenalyze.c:2137:9: note: ...this 'if' clause, but it is not
if(K_weight<I_weight)
^~
xenalyze.c: In function 'self_weighted_percentile':
xenalyze.c:2215:18: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
L=I; L_weight = I_weight;
^~~~~~~~
xenalyze.c:2214:9: note: ...this 'if' clause, but it is not
if(J_weight<K_weight)
^~
xenalyze.c:2217:18: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
R=J; R_weight = J_weight;
^~~~~~~~
xenalyze.c:2216:9: note: ...this 'if' clause, but it is not
if(K_weight<I_weight)
^~
I've modified according to what I think the intention is, i.e. added braces
rather than moving the line in question out a level.
I have only build tested the result.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
tools/xentrace/xenalyze.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/tools/xentrace/xenalyze.c b/tools/xentrace/xenalyze.c
index 5a2735c..4bcaf83 100644
--- a/tools/xentrace/xenalyze.c
+++ b/tools/xentrace/xenalyze.c
@@ -2132,10 +2132,14 @@ float weighted_percentile(float * A, /* values */
} while (I <= J); /* Keep going until our pointers meet or pass */
/* Re-adjust L and R, based on which element we're looking for */
- if(J_weight<K_weight)
- L=I; L_weight = I_weight;
- if(K_weight<I_weight)
- R=J; R_weight = J_weight;
+ if(J_weight<K_weight) {
+ L=I;
+ L_weight = I_weight;
+ }
+ if(K_weight<I_weight) {
+ R=J;
+ R_weight = J_weight;
+ }
}
return A[L];
@@ -2211,10 +2215,14 @@ long long self_weighted_percentile(long long * A,
} while (I <= J); /* Keep going until our pointers meet or pass */
/* Re-adjust L and R, based on which element we're looking for */
- if(J_weight<K_weight)
- L=I; L_weight = I_weight;
- if(K_weight<I_weight)
- R=J; R_weight = J_weight;
+ if(J_weight<K_weight) {
+ L=I;
+ L_weight = I_weight;
+ }
+ if(K_weight<I_weight) {
+ R=J;
+ R_weight = J_weight;
+ }
}
return A[L];
--
2.6.1
next prev parent reply other threads:[~2016-01-22 14:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 14:27 [PATCH 0/2] xenalyze: fixes for gcc-6's -Wmisleading-indentation Ian Campbell
2016-01-22 14:27 ` Ian Campbell [this message]
2016-01-26 11:57 ` [PATCH 1/2] xenalyze: fix misleading indentation George Dunlap
2016-01-22 14:27 ` [PATCH 2/2] xenalyze: remove cr3_compare_total Ian Campbell
2016-01-26 12:01 ` George Dunlap
2016-01-26 16:51 ` [PATCH 0/2] xenalyze: fixes for gcc-6's -Wmisleading-indentation Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453472849-25496-1-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).