2021-12-06 00:07:40

by David Yang

Subject: [PATCH v2] tests: remove unneeded conversion to bool

From: Yang Guang <[email protected]>

The coccinelle report
./tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c:225:18-23:
WARNING: conversion to bool not needed here
Relational and logical operators evaluate to bool,
explicit conversion is overly verbose and unneeded.

Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Yang Guang <[email protected]>

---

Changes in v2:
- Change the return type to bool.
---
.../move_mount_set_group/move_mount_set_group_test.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
index 860198f83a53..50ed5d475dd1 100644
--- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
+++ b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
@@ -191,7 +191,7 @@ static bool is_shared_mount(const char *path)
#define SET_GROUP_FROM "/tmp/move_mount_set_group_supported_from"
#define SET_GROUP_TO "/tmp/move_mount_set_group_supported_to"

-static int move_mount_set_group_supported(void)
+static bool move_mount_set_group_supported(void)
{
int ret;

@@ -222,7 +222,7 @@ static int move_mount_set_group_supported(void)
AT_FDCWD, SET_GROUP_TO, MOVE_MOUNT_SET_GROUP);
umount2("/tmp", MNT_DETACH);

- return ret < 0 ? false : true;
+ return ret >= 0;
}

FIXTURE(move_mount_set_group) {
@@ -232,7 +232,7 @@ FIXTURE(move_mount_set_group) {

FIXTURE_SETUP(move_mount_set_group)
{
- int ret;
+ bool ret;

ASSERT_EQ(prepare_unpriv_mountns(), 0);

@@ -254,7 +254,7 @@ FIXTURE_SETUP(move_mount_set_group)

FIXTURE_TEARDOWN(move_mount_set_group)
{
- int ret;
+ bool ret;

ret = move_mount_set_group_supported();
ASSERT_GE(ret, 0);
@@ -348,7 +348,7 @@ TEST_F(move_mount_set_group, complex_sharing_copying)
.shared = false,
};
pid_t pid;
- int ret;
+ bool ret;

ret = move_mount_set_group_supported();
ASSERT_GE(ret, 0);
--
2.30.2

2021-12-06 19:03:10

by Shuah Khan

Subject: Re: [PATCH v2] tests: remove unneeded conversion to bool

On 12/5/21 5:07 PM, [email protected] wrote:
> From: Yang Guang <[email protected]>
>
> The coccinelle report
> ./tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c:225:18-23:
> WARNING: conversion to bool not needed here
> Relational and logical operators evaluate to bool,
> explicit conversion is overly verbose and unneeded.
>
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Yang Guang <[email protected]>
>
> ---
>
> Changes in v2:
> - Change the return type to bool.
> ---
> .../move_mount_set_group/move_mount_set_group_test.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> index 860198f83a53..50ed5d475dd1 100644
> --- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> +++ b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> @@ -191,7 +191,7 @@ static bool is_shared_mount(const char *path)
> #define SET_GROUP_FROM "/tmp/move_mount_set_group_supported_from"
> #define SET_GROUP_TO "/tmp/move_mount_set_group_supported_to"
>
> -static int move_mount_set_group_supported(void)
> +static bool move_mount_set_group_supported(void)
> {
> int ret;
>
> @@ -222,7 +222,7 @@ static int move_mount_set_group_supported(void)
> AT_FDCWD, SET_GROUP_TO, MOVE_MOUNT_SET_GROUP);
> umount2("/tmp", MNT_DETACH);
>
> - return ret < 0 ? false : true;
> + return ret >= 0;
> }
>
> FIXTURE(move_mount_set_group) {
> @@ -232,7 +232,7 @@ FIXTURE(move_mount_set_group) {
>
> FIXTURE_SETUP(move_mount_set_group)
> {
> - int ret;
> + bool ret;
>
> ASSERT_EQ(prepare_unpriv_mountns(), 0);
>
> @@ -254,7 +254,7 @@ FIXTURE_SETUP(move_mount_set_group)
>
> FIXTURE_TEARDOWN(move_mount_set_group)
> {
> - int ret;
> + bool ret;
>
> ret = move_mount_set_group_supported();
> ASSERT_GE(ret, 0);
> @@ -348,7 +348,7 @@ TEST_F(move_mount_set_group, complex_sharing_copying)
> .shared = false,
> };
> pid_t pid;
> - int ret;
> + bool ret;
>
> ret = move_mount_set_group_supported();
> ASSERT_GE(ret, 0);
>

Applied. In the future use selftests/<test>: .... convention for
patch summary. Review "git log <filename>" history for how to
write summaries and change logs.

I fixed this one for now.

thanks,
-- Shuah

2021-12-07 00:20:57

by David Yang

Subject: Re: [PATCH v2] tests: remove unneeded conversion to bool

Thank you for your advice.

On Mon, Dec 06, 2021 at 12:03:06PM -0700, Shuah Khan wrote:
> On 12/5/21 5:07 PM, [email protected] wrote:
> > From: Yang Guang <[email protected]>
> >
> > The coccinelle report
> > ./tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c:225:18-23:
> > WARNING: conversion to bool not needed here
> > Relational and logical operators evaluate to bool,
> > explicit conversion is overly verbose and unneeded.
> >
> > Reported-by: Zeal Robot <[email protected]>
> > Signed-off-by: Yang Guang <[email protected]>
> >
> > ---
> >
> > Changes in v2:
> > - Change the return type to bool.
> > ---
> > .../move_mount_set_group/move_mount_set_group_test.c | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> > index 860198f83a53..50ed5d475dd1 100644
> > --- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> > +++ b/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
> > @@ -191,7 +191,7 @@ static bool is_shared_mount(const char *path)
> > #define SET_GROUP_FROM "/tmp/move_mount_set_group_supported_from"
> > #define SET_GROUP_TO "/tmp/move_mount_set_group_supported_to"
> > -static int move_mount_set_group_supported(void)
> > +static bool move_mount_set_group_supported(void)
> > {
> > int ret;
> > @@ -222,7 +222,7 @@ static int move_mount_set_group_supported(void)
> > AT_FDCWD, SET_GROUP_TO, MOVE_MOUNT_SET_GROUP);
> > umount2("/tmp", MNT_DETACH);
> > - return ret < 0 ? false : true;
> > + return ret >= 0;
> > }
> > FIXTURE(move_mount_set_group) {
> > @@ -232,7 +232,7 @@ FIXTURE(move_mount_set_group) {
> > FIXTURE_SETUP(move_mount_set_group)
> > {
> > - int ret;
> > + bool ret;
> > ASSERT_EQ(prepare_unpriv_mountns(), 0);
> > @@ -254,7 +254,7 @@ FIXTURE_SETUP(move_mount_set_group)
> > FIXTURE_TEARDOWN(move_mount_set_group)
> > {
> > - int ret;
> > + bool ret;
> > ret = move_mount_set_group_supported();
> > ASSERT_GE(ret, 0);
> > @@ -348,7 +348,7 @@ TEST_F(move_mount_set_group, complex_sharing_copying)
> > .shared = false,
> > };
> > pid_t pid;
> > - int ret;
> > + bool ret;
> > ret = move_mount_set_group_supported();
> > ASSERT_GE(ret, 0);
> >
>
> Applied. In the future use selftests/<test>: .... convention for
> patch summary. Review "git log <filename>" history for how to
> write summaries and change logs.
>
> I fixed this one for now.
>
> thanks,
> -- Shuah