| Message ID | 9bca1d9eb8ccacf4a64a8813f9eefe7f7272b3d6.1638581673.git.yang.guang5@zte.com.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] tests: remove unneeded conversion to bool | expand |
On 12/5/21 5:07 PM, davidcomponentone@gmail.com wrote: > From: Yang Guang <yang.guang5@zte.com.cn> > > 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 <zealci@zte.com.cn> > Signed-off-by: Yang Guang <yang.guang5@zte.com.cn> > > --- > > 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
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, davidcomponentone@gmail.com wrote: > > From: Yang Guang <yang.guang5@zte.com.cn> > > > > 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 <zealci@zte.com.cn> > > Signed-off-by: Yang Guang <yang.guang5@zte.com.cn> > > > > --- > > > > 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
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);