Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdec2685 authored by simran singhal's avatar simran singhal Committed by Pablo Neira Ayuso
Browse files

netfilter: Use seq_puts()/seq_putc() where possible 



For string without format specifiers, use seq_puts(). For
seq_printf("\n"), use seq_putc('\n').

Signed-off-by: default avatarsimran singhal <singhalsimran0@gmail.com>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 68ad546a

net/netfilter/ipvs/ip_vs_ctl.c

+4 −4
Original line number Diff line number Diff line
@@ -2130,7 +2130,7 @@ static int ip_vs_stats_show(struct seq_file *seq, void *v) 
/*               01234567 01234567 01234567 0123456701234567 0123456701234567 */

	seq_puts(seq,

		 "   Total Incoming Outgoing         Incoming         Outgoing\n");

	seq_printf(seq,

	seq_puts(seq,

		 "   Conns  Packets  Packets            Bytes            Bytes\n");



	ip_vs_copy_stats(&show, &net_ipvs(net)->tot_stats);
@@ -2178,7 +2178,7 @@ static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v) 
/*               01234567 01234567 01234567 0123456701234567 0123456701234567 */

	seq_puts(seq,

		 "       Total Incoming Outgoing         Incoming         Outgoing\n");

	seq_printf(seq,

	seq_puts(seq,

		 "CPU    Conns  Packets  Packets            Bytes            Bytes\n");



	for_each_possible_cpu(i) {

net/netfilter/nf_conntrack_expect.c

+2 −2
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static int exp_seq_show(struct seq_file *s, void *v) 
		seq_printf(s, "%ld ", timer_pending(&expect->timeout)

			   ? (long)(expect->timeout.expires - jiffies)/HZ : 0);

	else

		seq_printf(s, "- ");

		seq_puts(s, "- ");

	seq_printf(s, "l3proto = %u proto=%u ",

		   expect->tuple.src.l3num,

		   expect->tuple.dst.protonum);
@@ -559,7 +559,7 @@ static int exp_seq_show(struct seq_file *s, void *v) 
				       expect->tuple.dst.protonum));



	if (expect->flags & NF_CT_EXPECT_PERMANENT) {

		seq_printf(s, "PERMANENT");

		seq_puts(s, "PERMANENT");

		delim = ",";

	}

	if (expect->flags & NF_CT_EXPECT_INACTIVE) {

net/netfilter/nf_conntrack_standalone.c

+3 −3
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static int ct_seq_show(struct seq_file *s, void *v) 
		goto release;



	if (!(test_bit(IPS_SEEN_REPLY_BIT, &ct->status)))

		seq_printf(s, "[UNREPLIED] ");

		seq_puts(s, "[UNREPLIED] ");



	print_tuple(s, &ct->tuplehash[IP_CT_DIR_REPLY].tuple,

		    l3proto, l4proto);
@@ -261,7 +261,7 @@ static int ct_seq_show(struct seq_file *s, void *v) 
		goto release;



	if (test_bit(IPS_ASSURED_BIT, &ct->status))

		seq_printf(s, "[ASSURED] ");

		seq_puts(s, "[ASSURED] ");



	if (seq_has_overflowed(s))

		goto release;
@@ -350,7 +350,7 @@ static int ct_cpu_seq_show(struct seq_file *seq, void *v) 
	const struct ip_conntrack_stat *st = v;



	if (v == SEQ_START_TOKEN) {

		seq_printf(seq, "entries  searched found new invalid ignore delete delete_list insert insert_failed drop early_drop icmp_error  expect_new expect_create expect_delete search_restart\n");

		seq_puts(seq, "entries  searched found new invalid ignore delete delete_list insert insert_failed drop early_drop icmp_error  expect_new expect_create expect_delete search_restart\n");

		return 0;

	}

net/netfilter/nf_log.c

+2 −2
Original line number Diff line number Diff line
@@ -376,13 +376,13 @@ static int seq_show(struct seq_file *s, void *v) 
		logger = nft_log_dereference(loggers[*pos][i]);

		seq_printf(s, "%s", logger->name);

		if (i == 0 && loggers[*pos][i + 1] != NULL)

			seq_printf(s, ",");

			seq_puts(s, ",");



		if (seq_has_overflowed(s))

			return -ENOSPC;

	}



	seq_printf(s, ")\n");

	seq_puts(s, ")\n");



	if (seq_has_overflowed(s))

		return -ENOSPC;

net/netfilter/nf_synproxy_core.c

+3 −3
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int synproxy_cpu_seq_show(struct seq_file *seq, void *v) 
	struct synproxy_stats *stats = v;



	if (v == SEQ_START_TOKEN) {

		seq_printf(seq, "entries\t\tsyn_received\t"

		seq_puts(seq, "entries\t\tsyn_received\t"

			      "cookie_invalid\tcookie_valid\t"

			      "cookie_retrans\tconn_reopened\n");

		return 0;