aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/fib_trie.c
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2013-11-14 17:31:57 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-14 19:32:20 -0500
commit652586df95e5d76b37d07a11839126dcfede1621 (patch)
treee3a668265cade256302830ea3ff8b3699ab2977e /net/ipv4/fib_trie.c
parent839cc2a94cc3665bafe32203c2f095f4dd470a80 (diff)
seq_file: remove "%n" usage from seq_file users
All seq_printf() users are using "%n" for calculating padding size, convert them to use seq_setwidth() / seq_pad() pair. Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Joe Perches <joe@perches.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/ipv4/fib_trie.c')
-rw-r--r--net/ipv4/fib_trie.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index ec9a9ef4ce50..5afeb5aa4c7c 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2523,16 +2523,17 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
2523 list_for_each_entry_rcu(fa, &li->falh, fa_list) { 2523 list_for_each_entry_rcu(fa, &li->falh, fa_list) {
2524 const struct fib_info *fi = fa->fa_info; 2524 const struct fib_info *fi = fa->fa_info;
2525 unsigned int flags = fib_flag_trans(fa->fa_type, mask, fi); 2525 unsigned int flags = fib_flag_trans(fa->fa_type, mask, fi);
2526 int len;
2527 2526
2528 if (fa->fa_type == RTN_BROADCAST 2527 if (fa->fa_type == RTN_BROADCAST
2529 || fa->fa_type == RTN_MULTICAST) 2528 || fa->fa_type == RTN_MULTICAST)
2530 continue; 2529 continue;
2531 2530
2531 seq_setwidth(seq, 127);
2532
2532 if (fi) 2533 if (fi)
2533 seq_printf(seq, 2534 seq_printf(seq,
2534 "%s\t%08X\t%08X\t%04X\t%d\t%u\t" 2535 "%s\t%08X\t%08X\t%04X\t%d\t%u\t"
2535 "%d\t%08X\t%d\t%u\t%u%n", 2536 "%d\t%08X\t%d\t%u\t%u",
2536 fi->fib_dev ? fi->fib_dev->name : "*", 2537 fi->fib_dev ? fi->fib_dev->name : "*",
2537 prefix, 2538 prefix,
2538 fi->fib_nh->nh_gw, flags, 0, 0, 2539 fi->fib_nh->nh_gw, flags, 0, 0,
@@ -2541,15 +2542,15 @@ static int fib_route_seq_show(struct seq_file *seq, void *v)
2541 (fi->fib_advmss ? 2542 (fi->fib_advmss ?
2542 fi->fib_advmss + 40 : 0), 2543 fi->fib_advmss + 40 : 0),
2543 fi->fib_window, 2544 fi->fib_window,
2544 fi->fib_rtt >> 3, &len); 2545 fi->fib_rtt >> 3);
2545 else 2546 else
2546 seq_printf(seq, 2547 seq_printf(seq,
2547 "*\t%08X\t%08X\t%04X\t%d\t%u\t" 2548 "*\t%08X\t%08X\t%04X\t%d\t%u\t"
2548 "%d\t%08X\t%d\t%u\t%u%n", 2549 "%d\t%08X\t%d\t%u\t%u",
2549 prefix, 0, flags, 0, 0, 0, 2550 prefix, 0, flags, 0, 0, 0,
2550 mask, 0, 0, 0, &len); 2551 mask, 0, 0, 0);
2551 2552
2552 seq_printf(seq, "%*s\n", 127 - len, ""); 2553 seq_pad(seq, '\n');
2553 } 2554 }
2554 } 2555 }
2555 2556