diff mbox

netfilter: ipset: fix boolreturn.cocci warnings

Message ID 20150211123305.GA32347@waimea
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

kbuild test robot Feb. 11, 2015, 12:33 p.m. UTC 
net/netfilter/xt_set.c:196:9-10: WARNING: return of 0/1 in function 'set_match_v3' with return type bool
net/netfilter/xt_set.c:242:9-10: WARNING: return of 0/1 in function 'set_match_v4' with return type bool

 Return statements in functions returning bool should use
 true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci

CC: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---

 xt_set.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Pablo Neira Ayuso Feb. 11, 2015, 2:40 p.m. UTC | #1 
On Wed, Feb 11, 2015 at 08:33:05PM +0800, kbuild test robot wrote:
> net/netfilter/xt_set.c:196:9-10: WARNING: return of 0/1 in function 'set_match_v3' with return type bool
> net/netfilter/xt_set.c:242:9-10: WARNING: return of 0/1 in function 'set_match_v4' with return type bool
> 
>  Return statements in functions returning bool should use
>  true/false instead of 1/0.
> Generated by: scripts/coccinelle/misc/boolreturn.cocci

Jozsef, unless you have any objection, I'm going to apply this.

Thanks.

> CC: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> ---
> 
>  xt_set.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- a/net/netfilter/xt_set.c
> +++ b/net/netfilter/xt_set.c
> @@ -193,7 +193,7 @@ set_match_v3(const struct sk_buff *skb,
>  		return ret;
>  
>  	if (!match_counter0(opt.ext.packets, &info->packets))
> -		return 0;
> +		return false;
>  	return match_counter0(opt.ext.bytes, &info->bytes);
>  }
>  
> @@ -239,7 +239,7 @@ set_match_v4(const struct sk_buff *skb,
>  		return ret;
>  
>  	if (!match_counter(opt.ext.packets, &info->packets))
> -		return 0;
> +		return false;
>  	return match_counter(opt.ext.bytes, &info->bytes);
>  }
>  
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jozsef Kadlecsik Feb. 11, 2015, 2:50 p.m. UTC | #2 
On Wed, 11 Feb 2015, Pablo Neira Ayuso wrote:

> On Wed, Feb 11, 2015 at 08:33:05PM +0800, kbuild test robot wrote:
> > net/netfilter/xt_set.c:196:9-10: WARNING: return of 0/1 in function 'set_match_v3' with return type bool
> > net/netfilter/xt_set.c:242:9-10: WARNING: return of 0/1 in function 'set_match_v4' with return type bool
> > 
> >  Return statements in functions returning bool should use
> >  true/false instead of 1/0.
> > Generated by: scripts/coccinelle/misc/boolreturn.cocci
> 
> Jozsef, unless you have any objection, I'm going to apply this.

No objection, just go ahead.

Acked-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

Best regards,
Jozsef

> > CC: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
> > Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> > ---
> > 
> >  xt_set.c |    4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > --- a/net/netfilter/xt_set.c
> > +++ b/net/netfilter/xt_set.c
> > @@ -193,7 +193,7 @@ set_match_v3(const struct sk_buff *skb,
> >  		return ret;
> >  
> >  	if (!match_counter0(opt.ext.packets, &info->packets))
> > -		return 0;
> > +		return false;
> >  	return match_counter0(opt.ext.bytes, &info->bytes);
> >  }
> >  
> > @@ -239,7 +239,7 @@ set_match_v4(const struct sk_buff *skb,
> >  		return ret;
> >  
> >  	if (!match_counter(opt.ext.packets, &info->packets))
> > -		return 0;
> > +		return false;
> >  	return match_counter(opt.ext.bytes, &info->bytes);
> >  }
> >  
> 

-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jozsef Kadlecsik March 11, 2015, 7:08 p.m. UTC | #3 
On Wed, 11 Feb 2015, kbuild test robot wrote:

> net/netfilter/xt_set.c:196:9-10: WARNING: return of 0/1 in function 'set_match_v3' with return type bool
> net/netfilter/xt_set.c:242:9-10: WARNING: return of 0/1 in function 'set_match_v4' with return type bool
> 
>  Return statements in functions returning bool should use
>  true/false instead of 1/0.
> Generated by: scripts/coccinelle/misc/boolreturn.cocci
> 
> CC: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>

Patch is applied, thanks.

Best regards,
Jozsef

> ---
> 
>  xt_set.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- a/net/netfilter/xt_set.c
> +++ b/net/netfilter/xt_set.c
> @@ -193,7 +193,7 @@ set_match_v3(const struct sk_buff *skb,
>  		return ret;
>  
>  	if (!match_counter0(opt.ext.packets, &info->packets))
> -		return 0;
> +		return false;
>  	return match_counter0(opt.ext.bytes, &info->bytes);
>  }
>  
> @@ -239,7 +239,7 @@ set_match_v4(const struct sk_buff *skb,
>  		return ret;
>  
>  	if (!match_counter(opt.ext.packets, &info->packets))
> -		return 0;
> +		return false;
>  	return match_counter(opt.ext.bytes, &info->bytes);
>  }
>  
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso March 11, 2015, 7:12 p.m. UTC | #4 
Hi Jozsef,

On Wed, Mar 11, 2015 at 08:08:26PM +0100, Jozsef Kadlecsik wrote:
> On Wed, 11 Feb 2015, kbuild test robot wrote:
> 
> > net/netfilter/xt_set.c:196:9-10: WARNING: return of 0/1 in function 'set_match_v3' with return type bool
> > net/netfilter/xt_set.c:242:9-10: WARNING: return of 0/1 in function 'set_match_v4' with return type bool
> > 
> >  Return statements in functions returning bool should use
> >  true/false instead of 1/0.
> > Generated by: scripts/coccinelle/misc/boolreturn.cocci
> > 
> > CC: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
> > Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> 
> Patch is applied, thanks.

I took the liberty to pass this to David already.

7f73b9f netfilter: ipset: fix boolreturn.cocci warnings
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jozsef Kadlecsik March 11, 2015, 7:21 p.m. UTC | #5 
On Wed, 11 Mar 2015, Pablo Neira Ayuso wrote:

> Hi Jozsef,
> 
> On Wed, Mar 11, 2015 at 08:08:26PM +0100, Jozsef Kadlecsik wrote:
> > On Wed, 11 Feb 2015, kbuild test robot wrote:
> > 
> > > net/netfilter/xt_set.c:196:9-10: WARNING: return of 0/1 in function 'set_match_v3' with return type bool
> > > net/netfilter/xt_set.c:242:9-10: WARNING: return of 0/1 in function 'set_match_v4' with return type bool
> > > 
> > >  Return statements in functions returning bool should use
> > >  true/false instead of 1/0.
> > > Generated by: scripts/coccinelle/misc/boolreturn.cocci
> > > 
> > > CC: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
> > > Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> > 
> > Patch is applied, thanks.
> 
> I took the liberty to pass this to David already.
> 
> 7f73b9f netfilter: ipset: fix boolreturn.cocci warnings

I acked it actually :-))) - just forgot about it. Sorry for the noise.

Best regards,
Jozsef
-
E-mail  : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
          H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- a/net/netfilter/xt_set.c
+++ b/net/netfilter/xt_set.c
@@ -193,7 +193,7 @@  set_match_v3(const struct sk_buff *skb,
 		return ret;
 
 	if (!match_counter0(opt.ext.packets, &info->packets))
-		return 0;
+		return false;
 	return match_counter0(opt.ext.bytes, &info->bytes);
 }
 
@@ -239,7 +239,7 @@  set_match_v4(const struct sk_buff *skb,
 		return ret;
 
 	if (!match_counter(opt.ext.packets, &info->packets))
-		return 0;
+		return false;
 	return match_counter(opt.ext.bytes, &info->bytes);
 }