diff mbox

[1/2] xenalyze: fix misleading indentation.

Message ID 1453472849-25496-1-git-send-email-ian.campbell@citrix.com
State New, archived
Headers show

Commit Message

Ian Campbell Jan. 22, 2016, 2:27 p.m. UTC
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(-)

Comments

George Dunlap Jan. 26, 2016, 11:57 a.m. UTC | #1
On 22/01/16 14:27, Ian Campbell wrote:
> 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>

!!!

Hrm, well obviously the "weighted percentiles" have been wonky for a
long time. :-/

Reviewed-by: George Dunlap <george.dunlap@citrix.com>
diff mbox

Patch

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];