perf intel-bts: Use true,false for bool variable
Subsystems (2)
PATCH 1/1 perf intel-bts: Use true,false for bool variable
From: Kaixu Xia <[email protected]>
Fix the following coccinelle reports:
./tools/perf/util/intel-bts.c:472:3-13: WARNING: Assignment of 0/1 to bool variable ./tools/perf/util/intel-bts.c:515:3-13: WARNING: Assignment of 0/1 to bool variable
--- tools/perf/util/intel-bts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/intel-bts.c +2 -2
@@ -469,7 +469,7 @@ static int intel_bts_process_queue(struct intel_bts_queue *btsq, u64 *timestamp)if (!buffer) {if (!btsq->bts->sampling_mode) - btsq->done =1 ; + btsq->done = true; err =1 ; goto out_put; }
@@ -512,7 +512,7 @@ static int intel_bts_process_queue(struct intel_bts_queue *btsq, u64 *timestamp) *timestamp = btsq->buffer->reference; }else {if (!btsq->bts->sampling_mode) - btsq->done =1 ; + btsq->done = true; } out_put:thread__put (thread);
Signature · 1 line
2.20.0
Peter Zijlstra
maintainerQuoted 9 lines · On Fri, Nov 06, 2020 at 02:29:06PM +0800, [email protected] wrote:
From: Kaixu Xia <[email protected]>
Fix the following coccinelle reports:
./tools/perf/util/intel-bts.c:472:3-13: WARNING: Assignment of 0/1 to bool variable ./tools/perf/util/intel-bts.c:515:3-13: WARNING: Assignment of 0/1 to bool variable
Reported-by Tosk Robot <[email protected]>Signed-off-by Kaixu Xia <[email protected]>
Here, I've fixed it differently.
---
Subject: coccinelle: Remove broken check
From: Peter Zijlstra <[email protected]>
Date: Mon Nov 9 12:32:00 CET 2020
Get rid of the endless stream of patches that complain about:
"WARNING: Assignment of 0/1 to bool variable"
Which is perfectly valid C.
--- scripts/coccinelle/misc/boolinit.cocci | 195 --------------------------------- 1 file changed, 195 deletions(-)
scripts/coccinelle/misc/boolinit.cocci deleted +0 -195
@@ -1,195 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/// Bool initializations should use true and false. Bool tests don't need -/// comparisons. Based on contributions from Joe Perches, Rusty Russell -/// and Bruce W Allan. -/// -// Confidence: High -// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6. -// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6. -// URL: http://coccinelle.lip6.fr/ -// Options: --include-headers - -virtual patch -virtual context -virtual org -virtual report - -@boolok@ -symbol true,false; -@@ -( -true -| -false -) - -@depends on patch@ -bool t; -@@ - -( -- t == true -+ t -| -- true == t -+ t -| -- t != true -+ !t -| -- true != t -+ !t -| -- t == false -+ !t -| -- false == t -+ !t -| -- t != false -+ t -| -- false != t -+ t -) - -@depends on patch disable is_zero, isnt_zero@ -bool t; -@@ - -( -- t == 1 -+ t -| -- t != 1 -+ !t -| -- t == 0 -+ !t -| -- t != 0 -+ t -) - -@depends on patch && boolok@ -bool b; -@@ -( - b = -- 0 -+ false -| - b = -- 1 -+ true -) - -// --------------------------------------------------------------------- - -@r1 depends on !patch@ -bool t; -position p; -@@ - -( -* t@p == true -| -* true == t@p -| -* t@p != true -| -* true != t@p -| -* t@p == false -| -* false == t@p -| -* t@p != false -| -* false != t@p -) - -@r2 depends on !patch disable is_zero, isnt_zero@ -bool t; -position p; -@@ - -( -* t@p == 1 -| -* t@p != 1 -| -* t@p == 0 -| -* t@p != 0 -) - -@r3 depends on !patch && boolok@ -bool b; -position p1; -@@ -( -*b@p1 = 0 -| -*b@p1 = 1 -) - -@r4 depends on !patch@ -bool b; -position p2; -identifier i; -constant c != {0,1}; -@@ -( - b = i -| -*b@p2 = c -) - -@script:python depends on org@ -p << r1.p; -@@ - -cocci.print_main("WARNING: Comparison to bool",p) - -@script:python depends on org@ -p << r2.p; -@@ - -cocci.print_main("WARNING: Comparison of 0/1 to bool variable",p) - -@script:python depends on org@ -p1 << r3.p1; -@@ - -cocci.print_main("WARNING: Assignment of 0/1 to bool variable",p1) - -@script:python depends on org@ -p2 << r4.p2; -@@ - -cocci.print_main("ERROR: Assignment of non-0/1 constant to bool variable",p2) - -@script:python depends on report@ -p << r1.p; -@@ - -coccilib.report.print_report(p[0],"WARNING: Comparison to bool") - -@script:python depends on report@ -p << r2.p; -@@ - -coccilib.report.print_report(p[0],"WARNING: Comparison of 0/1 to bool variable") - -@script:python depends on report@ -p1 << r3.p1; -@@ - -coccilib.report.print_report(p1[0],"WARNING: Assignment of 0/1 to bool variable") - -@script:python depends on report@ -p2 << r4.p2; -@@ - -coccilib.report.print_report(p2[0],"ERROR: Assignment of non-0/1 constant to bool variable")
Julia Lawall
maintainerQuoted 5 lines · Peter Zijlstra
Quoted 4 lines · On Fri, Nov 06, 2020 at 02:29:06PM +0800, [email protected] wrote:
From: Kaixu Xia <[email protected]>
Fix the following coccinelle reports:
Quoted 7 lines
Quoted 5 lines
./tools/perf/util/intel-bts.c:472:3-13: WARNING: Assignment of 0/1 to bool variable ./tools/perf/util/intel-bts.c:515:3-13: WARNING: Assignment of 0/1 to bool variable
Reported-by Tosk Robot <[email protected]>Signed-off-by Kaixu Xia <[email protected]>Here, I've fixed it differently.
I applied this version, but removed the above text from the log message.
julia
Quoted 216 lines
---
Subject: coccinelle: Remove broken check
From: Peter Zijlstra <[email protected]>
Date: Mon Nov 9 12:32:00 CET 2020Get rid of the endless stream of patches that complain about:
"WARNING: Assignment of 0/1 to bool variable"
Which is perfectly valid C.
Signed-off-by Peter Zijlstra (Intel) <[email protected]>--- scripts/coccinelle/misc/boolinit.cocci | 195 --------------------------------- 1 file changed, 195 deletions(-)scripts/coccinelle/misc/boolinit.cocci deleted +0
-195@@ -1,195 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/// Bool initializations should use true and false. Bool tests don't need -/// comparisons. Based on contributions from Joe Perches, Rusty Russell -/// and Bruce W Allan. -/// -// Confidence: High -// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6. -// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6. -// URL: http://coccinelle.lip6.fr/ -// Options: --include-headers - -virtual patch -virtual context -virtual org -virtual report - -@boolok@ -symbol true,false; -@@ -( -true -| -false -) - -@depends on patch@ -bool t; -@@ - -( -- t == true -+ t -| -- true == t -+ t -| -- t != true -+ !t -| -- true != t -+ !t -| -- t == false -+ !t -| -- false == t -+ !t -| -- t != false -+ t -| -- false != t -+ t -) - -@depends on patch disable is_zero, isnt_zero@ -bool t; -@@ - -( -- t == 1 -+ t -| -- t != 1 -+ !t -| -- t == 0 -+ !t -| -- t != 0 -+ t -) - -@depends on patch && boolok@ -bool b; -@@ -( - b = -- 0 -+ false -| - b = -- 1 -+ true -) - -// --------------------------------------------------------------------- - -@r1 depends on !patch@ -bool t; -position p; -@@ - -( -* t@p == true -| -* true == t@p -| -* t@p != true -| -* true != t@p -| -* t@p == false -| -* false == t@p -| -* t@p != false -| -* false != t@p -) - -@r2 depends on !patch disable is_zero, isnt_zero@ -bool t; -position p; -@@ - -( -* t@p == 1 -| -* t@p != 1 -| -* t@p == 0 -| -* t@p != 0 -) - -@r3 depends on !patch && boolok@ -bool b; -position p1; -@@ -( -*b@p1 = 0 -| -*b@p1 = 1 -) - -@r4 depends on !patch@ -bool b; -position p2; -identifier i; -constant c != {0,1}; -@@ -( - b = i -| -*b@p2 = c -) - -@script:python depends on org@ -p << r1.p; -@@ - -cocci.print_main("WARNING: Comparison to bool",p) - -@script:python depends on org@ -p << r2.p; -@@ - -cocci.print_main("WARNING: Comparison of 0/1 to bool variable",p) - -@script:python depends on org@ -p1 << r3.p1; -@@ - -cocci.print_main("WARNING: Assignment of 0/1 to bool variable",p1) - -@script:python depends on org@ -p2 << r4.p2; -@@ - -cocci.print_main("ERROR: Assignment of non-0/1 constant to bool variable",p2) - -@script:python depends on report@ -p << r1.p; -@@ - -coccilib.report.print_report(p[0],"WARNING: Comparison to bool") - -@script:python depends on report@ -p << r2.p; -@@ - -coccilib.report.print_report(p[0],"WARNING: Comparison of 0/1 to bool variable") - -@script:python depends on report@ -p1 << r3.p1; -@@ - -coccilib.report.print_report(p1[0],"WARNING: Assignment of 0/1 to bool variable") - -@script:python depends on report@ -p2 << r4.p2; -@@ - -coccilib.report.print_report(p2[0],"ERROR: Assignment of non-0/1 constant to bool variable")