* [PATCH 23/25] netfilter: Use bool function return values of true/false not 1/0
2015-03-30 23:45 [PATCH 00/25] treewide: Use bool function return values of true/false not 1/0 Joe Perches
@ 2015-03-30 23:46 ` Joe Perches
2015-03-31 16:58 ` Pablo Neira Ayuso
2015-03-31 0:07 ` [PATCH 00/25] treewide: " Casey Schaufler
1 sibling, 1 reply; 5+ messages in thread
From: Joe Perches @ 2015-03-30 23:46 UTC (permalink / raw)
To: linux-kernel, Pablo Neira Ayuso, Patrick McHardy,
Jozsef Kadlecsik
Cc: David S. Miller, Alexey Kuznetsov, James Morris,
Hideaki YOSHIFUJI, netfilter-devel, coreteam, netdev
Use the normal return values for bool functions
Signed-off-by: Joe Perches <joe@perches.com>
---
net/ipv4/netfilter/ipt_ah.c | 2 +-
net/netfilter/ipset/ip_set_hash_ip.c | 8 ++++----
net/netfilter/ipset/ip_set_hash_ipmark.c | 8 ++++----
net/netfilter/ipset/ip_set_hash_ipport.c | 8 ++++----
net/netfilter/ipset/ip_set_hash_ipportip.c | 8 ++++----
net/netfilter/ipset/ip_set_hash_ipportnet.c | 8 ++++----
net/netfilter/ipset/ip_set_hash_net.c | 8 ++++----
net/netfilter/ipset/ip_set_hash_netiface.c | 8 ++++----
net/netfilter/ipset/ip_set_hash_netport.c | 8 ++++----
net/netfilter/ipset/ip_set_hash_netportnet.c | 8 ++++----
net/netfilter/xt_connlimit.c | 2 +-
net/netfilter/xt_hashlimit.c | 2 +-
net/netfilter/xt_ipcomp.c | 2 +-
13 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/net/ipv4/netfilter/ipt_ah.c b/net/ipv4/netfilter/ipt_ah.c
index 14a2aa8..756c004 100644
--- a/net/ipv4/netfilter/ipt_ah.c
+++ b/net/ipv4/netfilter/ipt_ah.c
@@ -47,7 +47,7 @@ static bool ah_mt(const struct sk_buff *skb, struct xt_action_param *par)
*/
pr_debug("Dropping evil AH tinygram.\n");
par->hotdrop = true;
- return 0;
+ return false;
}
return spi_match(ahinfo->spis[0], ahinfo->spis[1],
diff --git a/net/netfilter/ipset/ip_set_hash_ip.c b/net/netfilter/ipset/ip_set_hash_ip.c
index 76959d7..a7d6262 100644
--- a/net/netfilter/ipset/ip_set_hash_ip.c
+++ b/net/netfilter/ipset/ip_set_hash_ip.c
@@ -61,10 +61,10 @@ hash_ip4_data_list(struct sk_buff *skb, const struct hash_ip4_elem *e)
{
if (nla_put_ipaddr4(skb, IPSET_ATTR_IP, e->ip))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -196,10 +196,10 @@ hash_ip6_data_list(struct sk_buff *skb, const struct hash_ip6_elem *e)
{
if (nla_put_ipaddr6(skb, IPSET_ATTR_IP, &e->ip.in6))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_ipmark.c b/net/netfilter/ipset/ip_set_hash_ipmark.c
index 7abf978..327b331 100644
--- a/net/netfilter/ipset/ip_set_hash_ipmark.c
+++ b/net/netfilter/ipset/ip_set_hash_ipmark.c
@@ -63,10 +63,10 @@ hash_ipmark4_data_list(struct sk_buff *skb,
if (nla_put_ipaddr4(skb, IPSET_ATTR_IP, data->ip) ||
nla_put_net32(skb, IPSET_ATTR_MARK, htonl(data->mark)))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -191,10 +191,10 @@ hash_ipmark6_data_list(struct sk_buff *skb,
if (nla_put_ipaddr6(skb, IPSET_ATTR_IP, &data->ip.in6) ||
nla_put_net32(skb, IPSET_ATTR_MARK, htonl(data->mark)))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_ipport.c b/net/netfilter/ipset/ip_set_hash_ipport.c
index dcbcceb..b4748e9 100644
--- a/net/netfilter/ipset/ip_set_hash_ipport.c
+++ b/net/netfilter/ipset/ip_set_hash_ipport.c
@@ -69,10 +69,10 @@ hash_ipport4_data_list(struct sk_buff *skb,
nla_put_net16(skb, IPSET_ATTR_PORT, data->port) ||
nla_put_u8(skb, IPSET_ATTR_PROTO, data->proto))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -231,10 +231,10 @@ hash_ipport6_data_list(struct sk_buff *skb,
nla_put_net16(skb, IPSET_ATTR_PORT, data->port) ||
nla_put_u8(skb, IPSET_ATTR_PROTO, data->proto))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_ipportip.c b/net/netfilter/ipset/ip_set_hash_ipportip.c
index 7ef93fc..607461b 100644
--- a/net/netfilter/ipset/ip_set_hash_ipportip.c
+++ b/net/netfilter/ipset/ip_set_hash_ipportip.c
@@ -70,10 +70,10 @@ hash_ipportip4_data_list(struct sk_buff *skb,
nla_put_net16(skb, IPSET_ATTR_PORT, data->port) ||
nla_put_u8(skb, IPSET_ATTR_PROTO, data->proto))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -240,10 +240,10 @@ hash_ipportip6_data_list(struct sk_buff *skb,
nla_put_net16(skb, IPSET_ATTR_PORT, data->port) ||
nla_put_u8(skb, IPSET_ATTR_PROTO, data->proto))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_ipportnet.c b/net/netfilter/ipset/ip_set_hash_ipportnet.c
index b6012ad..f607ec9 100644
--- a/net/netfilter/ipset/ip_set_hash_ipportnet.c
+++ b/net/netfilter/ipset/ip_set_hash_ipportnet.c
@@ -114,10 +114,10 @@ hash_ipportnet4_data_list(struct sk_buff *skb,
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -367,10 +367,10 @@ hash_ipportnet6_data_list(struct sk_buff *skb,
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_net.c b/net/netfilter/ipset/ip_set_hash_net.c
index 6b3ac10..8bb8cd4 100644
--- a/net/netfilter/ipset/ip_set_hash_net.c
+++ b/net/netfilter/ipset/ip_set_hash_net.c
@@ -95,10 +95,10 @@ hash_net4_data_list(struct sk_buff *skb, const struct hash_net4_elem *data)
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -264,10 +264,10 @@ hash_net6_data_list(struct sk_buff *skb, const struct hash_net6_elem *data)
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_netiface.c b/net/netfilter/ipset/ip_set_hash_netiface.c
index 758b002..5a37ede 100644
--- a/net/netfilter/ipset/ip_set_hash_netiface.c
+++ b/net/netfilter/ipset/ip_set_hash_netiface.c
@@ -192,10 +192,10 @@ hash_netiface4_data_list(struct sk_buff *skb,
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -428,10 +428,10 @@ hash_netiface6_data_list(struct sk_buff *skb,
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_netport.c b/net/netfilter/ipset/ip_set_hash_netport.c
index c0ddb58..65abe45 100644
--- a/net/netfilter/ipset/ip_set_hash_netport.c
+++ b/net/netfilter/ipset/ip_set_hash_netport.c
@@ -110,10 +110,10 @@ hash_netport4_data_list(struct sk_buff *skb,
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -326,10 +326,10 @@ hash_netport6_data_list(struct sk_buff *skb,
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/ipset/ip_set_hash_netportnet.c b/net/netfilter/ipset/ip_set_hash_netportnet.c
index bfaa94c..8c80e84 100644
--- a/net/netfilter/ipset/ip_set_hash_netportnet.c
+++ b/net/netfilter/ipset/ip_set_hash_netportnet.c
@@ -124,10 +124,10 @@ hash_netportnet4_data_list(struct sk_buff *skb,
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
@@ -397,10 +397,10 @@ hash_netportnet6_data_list(struct sk_buff *skb,
(flags &&
nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))
goto nla_put_failure;
- return 0;
+ return false;
nla_put_failure:
- return 1;
+ return true;
}
static inline void
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index 29ba621..548537c 100644
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -92,7 +92,7 @@ static inline bool already_closed(const struct nf_conn *conn)
return conn->proto.tcp.state == TCP_CONNTRACK_TIME_WAIT ||
conn->proto.tcp.state == TCP_CONNTRACK_CLOSE;
else
- return 0;
+ return false;
}
static int
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 1786968..09c3446 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -285,7 +285,7 @@ static int htable_create(struct net *net, struct xt_hashlimit_mtinfo1 *minfo,
static bool select_all(const struct xt_hashlimit_htable *ht,
const struct dsthash_ent *he)
{
- return 1;
+ return true;
}
static bool select_gc(const struct xt_hashlimit_htable *ht,
diff --git a/net/netfilter/xt_ipcomp.c b/net/netfilter/xt_ipcomp.c
index 89d5310..85b6a9d 100644
--- a/net/netfilter/xt_ipcomp.c
+++ b/net/netfilter/xt_ipcomp.c
@@ -56,7 +56,7 @@ static bool comp_mt(const struct sk_buff *skb, struct xt_action_param *par)
*/
pr_debug("Dropping evil IPComp tinygram.\n");
par->hotdrop = true;
- return 0;
+ return false;
}
return spi_match(compinfo->spis[0], compinfo->spis[1],
--
2.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 00/25] treewide: Use bool function return values of true/false not 1/0
2015-03-30 23:45 [PATCH 00/25] treewide: Use bool function return values of true/false not 1/0 Joe Perches
2015-03-30 23:46 ` [PATCH 23/25] netfilter: " Joe Perches
@ 2015-03-31 0:07 ` Casey Schaufler
2015-03-31 0:14 ` Joe Perches
1 sibling, 1 reply; 5+ messages in thread
From: Casey Schaufler @ 2015-03-31 0:07 UTC (permalink / raw)
To: Joe Perches, linux-kernel, linux-arm-kernel, kvmarm, kvm,
linux-omap, kvm-ppc, virtualization, linux-fsdevel, linux-nfs,
linux-ide, kgdb-bugreport, linux-mm, linux-pm, netdev, alsa-devel,
bridge, netfilter-devel, coreteam, patches
Cc: linux-hexagon, linux-ia64, linux-mips, linuxppc-dev, linux-s390,
sparclinux, linux-scsi, linux-security-module
On 3/30/2015 4:45 PM, Joe Perches wrote:
> Joe Perches (25):
> arm: Use bool function return values of true/false not 1/0
> arm64: Use bool function return values of true/false not 1/0
> hexagon: Use bool function return values of true/false not 1/0
> ia64: Use bool function return values of true/false not 1/0
> mips: Use bool function return values of true/false not 1/0
> powerpc: Use bool function return values of true/false not 1/0
> s390: Use bool function return values of true/false not 1/0
> sparc: Use bool function return values of true/false not 1/0
> tile: Use bool function return values of true/false not 1/0
> unicore32: Use bool function return values of true/false not 1/0
> x86: Use bool function return values of true/false not 1/0
> virtio_console: Use bool function return values of true/false not 1/0
> csiostor: Use bool function return values of true/false not 1/0
> dcache: Use bool function return values of true/false not 1/0
> nfsd: nfs4state: Use bool function return values of true/false not 1/0
> include/linux: Use bool function return values of true/false not 1/0
> sound: Use bool function return values of true/false not 1/0
> rcu: tree_plugin: Use bool function return values of true/false not 1/0
> sched: Use bool function return values of true/false not 1/0
> ftrace: Use bool function return values of true/false not 1/0
> slub: Use bool function return values of true/false not 1/0
> bridge: Use bool function return values of true/false not 1/0
> netfilter: Use bool function return values of true/false not 1/0
> security: Use bool function return values of true/false not 1/0
> sound: wm5100-tables: Use bool function return values of true/false not 1/0
>
> arch/arm/include/asm/dma-mapping.h | 8 ++--
> arch/arm/include/asm/kvm_emulate.h | 2 +-
> arch/arm/mach-omap2/powerdomain.c | 14 +++---
> arch/arm64/include/asm/dma-mapping.h | 2 +-
> arch/hexagon/include/asm/dma-mapping.h | 2 +-
> arch/ia64/include/asm/dma-mapping.h | 2 +-
> arch/mips/include/asm/dma-mapping.h | 2 +-
> arch/powerpc/include/asm/dcr-native.h | 2 +-
> arch/powerpc/include/asm/dma-mapping.h | 4 +-
> arch/powerpc/include/asm/kvm_book3s_64.h | 4 +-
> arch/powerpc/sysdev/dcr.c | 2 +-
> arch/s390/include/asm/dma-mapping.h | 2 +-
> arch/sparc/mm/init_64.c | 8 ++--
> arch/tile/include/asm/dma-mapping.h | 2 +-
> arch/unicore32/include/asm/dma-mapping.h | 2 +-
> arch/x86/include/asm/archrandom.h | 2 +-
> arch/x86/include/asm/dma-mapping.h | 2 +-
> arch/x86/include/asm/kvm_para.h | 2 +-
> arch/x86/kvm/cpuid.h | 2 +-
> arch/x86/kvm/vmx.c | 72 ++++++++++++++--------------
> drivers/char/virtio_console.c | 2 +-
> drivers/scsi/csiostor/csio_scsi.c | 4 +-
> fs/dcache.c | 12 ++---
> fs/nfsd/nfs4state.c | 2 +-
> include/linux/blkdev.h | 2 +-
> include/linux/ide.h | 2 +-
> include/linux/kgdb.h | 2 +-
> include/linux/mfd/db8500-prcmu.h | 2 +-
> include/linux/mm.h | 2 +-
> include/linux/power_supply.h | 8 ++--
> include/linux/ssb/ssb_driver_extif.h | 2 +-
> include/linux/ssb/ssb_driver_gige.h | 16 +++----
> include/sound/soc.h | 4 +-
> kernel/rcu/tree_plugin.h | 4 +-
> kernel/sched/auto_group.h | 2 +-
> kernel/sched/completion.c | 16 ++++---
> kernel/trace/ftrace.c | 10 ++--
> mm/slub.c | 12 ++---
> net/bridge/br_private.h | 2 +-
> net/ipv4/netfilter/ipt_ah.c | 2 +-
> net/netfilter/ipset/ip_set_hash_ip.c | 8 ++--
> net/netfilter/ipset/ip_set_hash_ipmark.c | 8 ++--
> net/netfilter/ipset/ip_set_hash_ipport.c | 8 ++--
> net/netfilter/ipset/ip_set_hash_ipportip.c | 8 ++--
> net/netfilter/ipset/ip_set_hash_ipportnet.c | 8 ++--
> net/netfilter/ipset/ip_set_hash_net.c | 8 ++--
> net/netfilter/ipset/ip_set_hash_netiface.c | 8 ++--
> net/netfilter/ipset/ip_set_hash_netport.c | 8 ++--
> net/netfilter/ipset/ip_set_hash_netportnet.c | 8 ++--
> net/netfilter/xt_connlimit.c | 2 +-
> net/netfilter/xt_hashlimit.c | 2 +-
> net/netfilter/xt_ipcomp.c | 2 +-
> security/apparmor/file.c | 8 ++--
> security/apparmor/policy.c | 10 ++--
> sound/soc/codecs/wm5100-tables.c | 12 ++---
Why, and why these in particular?
> 55 files changed, 178 insertions(+), 176 deletions(-)
>
^ permalink raw reply [flat|nested] 5+ messages in thread