From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753774AbbBRBTK (ORCPT ); Tue, 17 Feb 2015 20:19:10 -0500 Received: from smtprelay0050.hostedemail.com ([216.40.44.50]:38565 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751800AbbBRBTI (ORCPT ); Tue, 17 Feb 2015 20:19:08 -0500 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 50,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::,RULES_HIT:41:355:379:541:599:800:960:967:968:973:988:989:1260:1263:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1543:1593:1594:1711:1714:1730:1747:1777:1792:1801:2393:2525:2561:2564:2682:2685:2689:2828:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3350:3622:3657:3770:3865:3866:3867:3870:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4605:5007:6117:6261:8599:9010:9025:9388:10004:10400:10848:11026:11232:11253:11473:11658:11854:11914:12043:12214:12296:12438:12517:12519:12555:12740:12776:13019:13095:13161:13229:13255:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: fan21_31d7d2cc3d94d X-Filterd-Recvd-Size: 4678 Message-ID: <1424222340.25416.19.camel@perches.com> Subject: Re: [PATCH net-next] netfilter: Remove uses of return value of seq_printf/puts/putc From: Joe Perches To: Pablo Neira Ayuso Cc: netfilter-devel , netdev , LKML Date: Tue, 17 Feb 2015 17:19:00 -0800 In-Reply-To: <1424136309.8287.8.camel@perches.com> References: <1424136309.8287.8.camel@perches.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.12.7-0ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2015-02-16 at 17:25 -0800, Joe Perches wrote: > These functions are soon going to return void so remove the > return value uses. > > Convert the return value to test seq_has_overflowed() instead. Please do not apply. These need conversions not to "return seq_has_ > Signed-off-by: Joe Perches > --- > net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 +++- > net/netfilter/nf_conntrack_acct.c | 8 +++++--- > net/netfilter/nf_conntrack_expect.c | 4 +++- > net/netfilter/nfnetlink_log.c | 12 +++++++----- > 4 files changed, 18 insertions(+), 10 deletions(-) > > diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c > index a460a87..b03b801 100644 > --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c > +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c > @@ -300,7 +300,9 @@ static int exp_seq_show(struct seq_file *s, void *v) > __nf_ct_l3proto_find(exp->tuple.src.l3num), > __nf_ct_l4proto_find(exp->tuple.src.l3num, > exp->tuple.dst.protonum)); > - return seq_putc(s, '\n'); > + seq_putc(s, '\n'); > + > + return seq_has_overflowed(s); > } > > static const struct seq_operations exp_seq_ops = { > diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c > index a4b5e2a..4d291dc 100644 > --- a/net/netfilter/nf_conntrack_acct.c > +++ b/net/netfilter/nf_conntrack_acct.c > @@ -47,9 +47,11 @@ seq_print_acct(struct seq_file *s, const struct nf_conn *ct, int dir) > return 0; > > counter = acct->counter; > - return seq_printf(s, "packets=%llu bytes=%llu ", > - (unsigned long long)atomic64_read(&counter[dir].packets), > - (unsigned long long)atomic64_read(&counter[dir].bytes)); > + seq_printf(s, "packets=%llu bytes=%llu ", > + (unsigned long long)atomic64_read(&counter[dir].packets), > + (unsigned long long)atomic64_read(&counter[dir].bytes)); > + > + return seq_has_overflowed(s); > }; > EXPORT_SYMBOL_GPL(seq_print_acct); > > diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c > index 91a1837..1abf92f 100644 > --- a/net/netfilter/nf_conntrack_expect.c > +++ b/net/netfilter/nf_conntrack_expect.c > @@ -561,7 +561,9 @@ static int exp_seq_show(struct seq_file *s, void *v) > helper->expect_policy[expect->class].name); > } > > - return seq_putc(s, '\n'); > + seq_putc(s, '\n'); > + > + return seq_has_overflowed(s); > } > > static const struct seq_operations exp_seq_ops = { > diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c > index 11d85b3..3e016ff 100644 > --- a/net/netfilter/nfnetlink_log.c > +++ b/net/netfilter/nfnetlink_log.c > @@ -998,11 +998,13 @@ static int seq_show(struct seq_file *s, void *v) > { > const struct nfulnl_instance *inst = v; > > - return seq_printf(s, "%5d %6d %5d %1d %5d %6d %2d\n", > - inst->group_num, > - inst->peer_portid, inst->qlen, > - inst->copy_mode, inst->copy_range, > - inst->flushtimeout, atomic_read(&inst->use)); > + seq_printf(s, "%5d %6d %5d %1d %5d %6d %2d\n", > + inst->group_num, > + inst->peer_portid, inst->qlen, > + inst->copy_mode, inst->copy_range, > + inst->flushtimeout, atomic_read(&inst->use)); > + > + return seq_has_overflowed(s); > } > > static const struct seq_operations nful_seq_ops = { > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/