Hello.
Well, basic idea is okay. But...
In article <[EMAIL PROTECTED]> (at Fri, 13 Jan 2006 14:14:48 -0800), Joe
Perches <[EMAIL PROTECTED]> says:
> diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
> index 7129d42..dfb4f14 100644
> --- a/net/ipv6/addrconf.c
> +++ b/net/ipv6/addrconf.c
> @@ -2644,7 +2644,7 @@ static int if6_seq_show(struct seq_file
> {
> struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v;
> seq_printf(seq,
> - "%04x%04x%04x%04x%04x%04x%04x%04x %02x %02x %02x %02x %8s\n",
> + NIP6_FMT " %02x %02x %02x %02x %8s\n",
> NIP6(ifp->addr),
> ifp->idev->dev->ifindex,
> ifp->prefix_len,
Don't change this, or break many applications.
> diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
> index 65e73ac..72bd08a 100644
> --- a/net/ipv6/anycast.c
> +++ b/net/ipv6/anycast.c
> @@ -532,9 +532,7 @@ static int ac6_seq_show(struct seq_file
> struct ac6_iter_state *state = ac6_seq_private(seq);
>
> seq_printf(seq,
> - "%-4d %-15s "
> - "%04x%04x%04x%04x%04x%04x%04x%04x "
> - "%5d\n",
> + "%-4d %-15s " NIP6_FMT " %5d\n",
> state->dev->ifindex, state->dev->name,
> NIP6(im->aca_addr),
> im->aca_users);
ditto.
> diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
> index 964ad9d..4183c8d 100644
> --- a/net/ipv6/ip6_flowlabel.c
> +++ b/net/ipv6/ip6_flowlabel.c
> @@ -629,9 +629,7 @@ static void ip6fl_fl_seq_show(struct seq
> {
> while(fl) {
> seq_printf(seq,
> - "%05X %-1d %-6d %-6d %-6ld %-8ld "
> - "%02x%02x%02x%02x%02x%02x%02x%02x "
> - "%-4d\n",
> + "%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_FMT "
> %-4d\n",
> (unsigned)ntohl(fl->label),
> fl->share,
> (unsigned)fl->owner,
ditto.
> @@ -647,8 +645,8 @@ static void ip6fl_fl_seq_show(struct seq
> static int ip6fl_seq_show(struct seq_file *seq, void *v)
> {
> if (v == SEQ_START_TOKEN)
> - seq_puts(seq, "Label S Owner Users Linger Expires "
> - "Dst Opt\n");
> + seq_printf(seq, "%-5s %-1s %-6s %-6s %-6s %-8s %-39s %s\n",
> + "Label", "S", "Owner", "Users", "Linger", "Expires",
> "Dst", "Opt");
> else
> ip6fl_fl_seq_show(seq, v);
> return 0;
Please keep using seq_puts() for constant string.
> diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
> index cc3e9f5..0e03eab 100644
> --- a/net/ipv6/mcast.c
> +++ b/net/ipv6/mcast.c
> @@ -2373,7 +2373,7 @@ static int igmp6_mc_seq_show(struct seq_
> struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
>
> seq_printf(seq,
> - "%-4d %-15s %04x%04x%04x%04x%04x%04x%04x%04x %5d %08X
> %ld\n",
> + "%-4d %-15s " NIP6_FMT " %5d %08X %ld\n",
> state->dev->ifindex, state->dev->name,
> NIP6(im->mca_addr),
> im->mca_users, im->mca_flags,
> @@ -2542,15 +2542,12 @@ static int igmp6_mcf_seq_show(struct seq
> if (v == SEQ_START_TOKEN) {
> seq_printf(seq,
> "%3s %6s "
> - "%32s %32s %6s %6s\n", "Idx",
> + "%39s %39s %6s %6s\n", "Idx",
> "Device", "Multicast Address",
> "Source Address", "INC", "EXC");
> } else {
> seq_printf(seq,
> - "%3d %6.6s "
> - "%04x%04x%04x%04x%04x%04x%04x%04x "
> - "%04x%04x%04x%04x%04x%04x%04x%04x "
> - "%6lu %6lu\n",
> + "%3d %6.6s " NIP6_FMT " " NIP6_FMT " %6lu %6lu\n",
> state->dev->ifindex, state->dev->name,
> NIP6(state->im->mca_addr),
> NIP6(psf->sf_addr),
Same as addrconf/mcast.
Thanks.
--
YOSHIFUJI Hideaki @ USAGI Project <[EMAIL PROTECTED]>
GPG-FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
