diff mbox

[v3] batman-adv: use static string for table headers

Message ID 1457775018-16546-1-git-send-email-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit f7be1dfcea6e0f28e2eb5f243ad0e0cef1ebd2f7
Delegated to: Marek Lindner
Headers

Commit Message

Sven Eckelmann March 12, 2016, 9:30 a.m. UTC 
  From: Antonio Quartulli <a@unstable.cc>

Use a static string when showing table headers rather then
a nonsense parametric one with fixed arguments.

It is easier to grep and it does not need to be recomputed
at runtime each time.

Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
[sven@narfation.org: fix conflicts with current version]
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v3:
 - workaround checkpatch error (over 80 chars) caused by __stringify
v2:
 - rebased patch
 - added new static strings in bat_v.c and bat_iv_ogm.c

Patch was resurrected from https://patchwork.open-mesh.org/patch/3599/

I've requested an rebased version at
https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014637.html
but done it myself because it was rather trivial.
---
 net/batman-adv/bat_iv_ogm.c            | 8 +++-----
 net/batman-adv/bat_v.c                 | 9 ++++-----
 net/batman-adv/bridge_loop_avoidance.c | 7 +++----
 net/batman-adv/distributed-arp-table.c | 4 ++--
 net/batman-adv/translation-table.c     | 9 ++++-----
 5 files changed, 16 insertions(+), 21 deletions(-)

Comments

Marek Lindner April 11, 2016, 4:04 p.m. UTC | #1 
On Saturday, March 12, 2016 10:30:18 Sven Eckelmann wrote:
> From: Antonio Quartulli <a@unstable.cc>
> 
> Use a static string when showing table headers rather then
> a nonsense parametric one with fixed arguments.
> 
> It is easier to grep and it does not need to be recomputed
> at runtime each time.
> 
> Reported-by: Joe Perches <joe@perches.com>
> Signed-off-by: Antonio Quartulli <a@unstable.cc>
> [sven@narfation.org: fix conflicts with current version]
> Signed-off-by: Sven Eckelmann <sven@narfation.org>
> ---
> v3:
>  - workaround checkpatch error (over 80 chars) caused by __stringify
> v2:
>  - rebased patch
>  - added new static strings in bat_v.c and bat_iv_ogm.c
> 
> Patch was resurrected from https://patchwork.open-mesh.org/patch/3599/
> 
> I've requested an rebased version at
> https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014637.html
> but done it myself because it was rather trivial.
> ---
>  net/batman-adv/bat_iv_ogm.c            | 8 +++-----
>  net/batman-adv/bat_v.c                 | 9 ++++-----
>  net/batman-adv/bridge_loop_avoidance.c | 7 +++----
>  net/batman-adv/distributed-arp-table.c | 4 ++--
>  net/batman-adv/translation-table.c     | 9 ++++-----
>  5 files changed, 16 insertions(+), 21 deletions(-)

Applied in revision f7be1df.

Thanks,
Marek
Antonio Quartulli May 5, 2016, 2:47 p.m. UTC | #2 
On Tue, Apr 12, 2016 at 12:04:06AM +0800, Marek Lindner wrote:
> On Saturday, March 12, 2016 10:30:18 Sven Eckelmann wrote:
> > From: Antonio Quartulli <a@unstable.cc>
> > 
> > Use a static string when showing table headers rather then
> > a nonsense parametric one with fixed arguments.
> > 
> > It is easier to grep and it does not need to be recomputed
> > at runtime each time.
> > 
> > Reported-by: Joe Perches <joe@perches.com>
> > Signed-off-by: Antonio Quartulli <a@unstable.cc>
> > [sven@narfation.org: fix conflicts with current version]
> > Signed-off-by: Sven Eckelmann <sven@narfation.org>
> > ---
> > v3:
> >  - workaround checkpatch error (over 80 chars) caused by __stringify
> > v2:
> >  - rebased patch
> >  - added new static strings in bat_v.c and bat_iv_ogm.c
> > 
> > Patch was resurrected from https://patchwork.open-mesh.org/patch/3599/
> > 
> > I've requested an rebased version at
> > https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-March/014637.html
> > but done it myself because it was rather trivial.
> > ---
> >  net/batman-adv/bat_iv_ogm.c            | 8 +++-----
> >  net/batman-adv/bat_v.c                 | 9 ++++-----
> >  net/batman-adv/bridge_loop_avoidance.c | 7 +++----
> >  net/batman-adv/distributed-arp-table.c | 4 ++--
> >  net/batman-adv/translation-table.c     | 9 ++++-----
> >  5 files changed, 16 insertions(+), 21 deletions(-)
> 
> Applied in revision f7be1df.

The Gateway table was missed here ..

Cheers,
Sven Eckelmann May 5, 2016, 3:10 p.m. UTC | #3 
On Thursday 05 May 2016 22:47:27 Antonio Quartulli wrote:
[...]
> > >  net/batman-adv/bat_iv_ogm.c            | 8 +++-----
> > >  net/batman-adv/bat_v.c                 | 9 ++++-----
> > >  net/batman-adv/bridge_loop_avoidance.c | 7 +++----
> > >  net/batman-adv/distributed-arp-table.c | 4 ++--
> > >  net/batman-adv/translation-table.c     | 9 ++++-----
> > >  5 files changed, 16 insertions(+), 21 deletions(-)
> > 
> > Applied in revision f7be1df.
> 
> The Gateway table was missed here ..

Yes, it was also not part your first patch:
 https://patchwork.open-mesh.org/patch/3599/

Kind regards,
	Sven
Antonio Quartulli May 5, 2016, 3:12 p.m. UTC | #4 
On Thu, May 05, 2016 at 05:10:28PM +0200, Sven Eckelmann wrote:
> On Thursday 05 May 2016 22:47:27 Antonio Quartulli wrote:
> [...]
> > > >  net/batman-adv/bat_iv_ogm.c            | 8 +++-----
> > > >  net/batman-adv/bat_v.c                 | 9 ++++-----
> > > >  net/batman-adv/bridge_loop_avoidance.c | 7 +++----
> > > >  net/batman-adv/distributed-arp-table.c | 4 ++--
> > > >  net/batman-adv/translation-table.c     | 9 ++++-----
> > > >  5 files changed, 16 insertions(+), 21 deletions(-)
> > > 
> > > Applied in revision f7be1df.
> > 
> > The Gateway table was missed here ..
> 
> Yes, it was also not part your first patch:
>  https://patchwork.open-mesh.org/patch/3599/

Working on that now. I will provide a patch for this.

Cheers,
diff mbox

Patch

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 2c65668..d9a826a 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -1866,9 +1866,8 @@  static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv,
 	int batman_count = 0;
 	u32 i;
 
-	seq_printf(seq, "  %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",
-		   "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE,
-		   "Nexthop", "outgoingIF", "Potential nexthops");
+	seq_puts(seq,
+		 "  Originator      last-seen (#/255)           Nexthop [outgoingIF]:   Potential nexthops ...\n");
 
 	for (i = 0; i < hash->size; i++) {
 		head = &hash->table[i];
@@ -1948,8 +1947,7 @@  static void batadv_iv_neigh_print(struct batadv_priv *bat_priv,
 	struct batadv_hard_iface *hard_iface;
 	int batman_count = 0;
 
-	seq_printf(seq, "   %10s        %-13s %s\n",
-		   "IF", "Neighbor", "last-seen");
+	seq_puts(seq, "           IF        Neighbor      last-seen\n");
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 3315b9a..246f9e9 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -151,8 +151,8 @@  static void batadv_v_neigh_print(struct batadv_priv *bat_priv,
 	struct batadv_hard_iface *hard_iface;
 	int batman_count = 0;
 
-	seq_printf(seq, "  %-15s %s (%11s) [%10s]\n", "Neighbor",
-		   "last-seen", "throughput", "IF");
+	seq_puts(seq,
+		 "  Neighbor        last-seen ( throughput) [        IF]\n");
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
@@ -191,9 +191,8 @@  static void batadv_v_orig_print(struct batadv_priv *bat_priv,
 	int batman_count = 0;
 	u32 i;
 
-	seq_printf(seq, "  %-15s %s (%11s) %17s [%10s]: %20s ...\n",
-		   "Originator", "last-seen", "throughput", "Nexthop",
-		   "outgoingIF", "Potential nexthops");
+	seq_puts(seq,
+		 "  Originator      last-seen ( throughput)           Nexthop [outgoingIF]:   Potential nexthops ...\n");
 
 	for (i = 0; i < hash->size; i++) {
 		head = &hash->table[i];
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 642167f..0c951a7 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1816,8 +1816,8 @@  int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
 		   "Claims announced for the mesh %s (orig %pM, group id %#.4x)\n",
 		   net_dev->name, primary_addr,
 		   ntohs(bat_priv->bla.claim_dest.group));
-	seq_printf(seq, "   %-17s    %-5s    %-17s [o] (%-6s)\n",
-		   "Client", "VID", "Originator", "CRC");
+	seq_puts(seq,
+		 "   Client               VID      Originator        [o] (CRC   )\n");
 	for (i = 0; i < hash->size; i++) {
 		head = &hash->table[i];
 
@@ -1874,8 +1874,7 @@  int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset)
 		   "Backbones announced for the mesh %s (orig %pM, group id %#.4x)\n",
 		   net_dev->name, primary_addr,
 		   ntohs(bat_priv->bla.claim_dest.group));
-	seq_printf(seq, "   %-17s    %-5s %-9s (%-6s)\n",
-		   "Originator", "VID", "last seen", "CRC");
+	seq_puts(seq, "   Originator           VID   last seen (CRC   )\n");
 	for (i = 0; i < hash->size; i++) {
 		head = &hash->table[i];
 
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 919a8d2..771708c 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -814,8 +814,8 @@  int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset)
 		goto out;
 
 	seq_printf(seq, "Distributed ARP Table (%s):\n", net_dev->name);
-	seq_printf(seq, "          %-7s          %-9s %4s %11s\n", "IPv4",
-		   "MAC", "VID", "last-seen");
+	seq_puts(seq,
+		 "          IPv4             MAC        VID   last-seen\n");
 
 	for (i = 0; i < hash->size; i++) {
 		head = &hash->table[i];
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 2ed55f4..d7f37e5 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1008,8 +1008,8 @@  int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset)
 	seq_printf(seq,
 		   "Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n",
 		   net_dev->name, (u8)atomic_read(&bat_priv->tt.vn));
-	seq_printf(seq, "       %-13s  %s %-8s %-9s (%-10s)\n", "Client", "VID",
-		   "Flags", "Last seen", "CRC");
+	seq_puts(seq,
+		 "       Client         VID Flags    Last seen (CRC       )\n");
 
 	for (i = 0; i < hash->size; i++) {
 		head = &hash->table[i];
@@ -1706,9 +1706,8 @@  int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset)
 	seq_printf(seq,
 		   "Globally announced TT entries received via the mesh %s\n",
 		   net_dev->name);
-	seq_printf(seq, "       %-13s  %s  %s       %-15s %s (%-10s) %s\n",
-		   "Client", "VID", "(TTVN)", "Originator", "(Curr TTVN)",
-		   "CRC", "Flags");
+	seq_puts(seq,
+		 "       Client         VID  (TTVN)       Originator      (Curr TTVN) (CRC       ) Flags\n");
 
 	for (i = 0; i < hash->size; i++) {
 		head = &hash->table[i];