[PATCH iproute2] police: Small corrections for the output

[PATCH iproute2] police: Small corrections for the output

[Roi Dayan]

Start a newline right before printing the index.
Print overhead with print_size().

Fixes: 0d5cf51e0d6c ("police: Add support for json output")
Signed-off-by: Roi Dayan <roid@nvidia.com>
---
 tc/m_police.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tc/m_police.c b/tc/m_police.c
index 2594c08979e0..a17ab64b1ce5 100644
--- a/tc/m_police.c
+++ b/tc/m_police.c
@@ -301,7 +301,8 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg)
 	    RTA_PAYLOAD(tb[TCA_POLICE_RATE64]) >= sizeof(rate64))
 		rate64 = rta_getattr_u64(tb[TCA_POLICE_RATE64]);
 
-	print_uint(PRINT_ANY, "index", "\t index %u ", p->index);
+	print_nl();
+	print_uint(PRINT_ANY, "index", "\tindex %u ", p->index);
 	tc_print_rate(PRINT_FP, NULL, "rate %s ", rate64);
 	buffer = tc_calc_xmitsize(rate64, p->burst);
 	print_size(PRINT_FP, NULL, "burst %s ", buffer);
@@ -342,7 +343,7 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg)
 		print_string(PRINT_FP, NULL, " ", NULL);
 	}
 
-	print_uint(PRINT_ANY, "overhead", "overhead %u ", p->rate.overhead);
+	print_size(PRINT_ANY, "overhead", "overhead %s ", p->rate.overhead);
 	linklayer = (p->rate.linklayer & TC_LINKLAYER_MASK);
 	if (linklayer > TC_LINKLAYER_ETHERNET || show_details)
 		print_string(PRINT_ANY, "linklayer", "linklayer %s ",
-- 
2.8.0

Re: [PATCH iproute2] police: Small corrections for the output

[Roi Dayan]

On 2021-07-08 10:47 AM, Roi Dayan wrote:
> Start a newline right before printing the index.
> Print overhead with print_size().
> 
> Fixes: 0d5cf51e0d6c ("police: Add support for json output")
> Signed-off-by: Roi Dayan <roid@nvidia.com>
> ---
>   tc/m_police.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tc/m_police.c b/tc/m_police.c
> index 2594c08979e0..a17ab64b1ce5 100644
> --- a/tc/m_police.c
> +++ b/tc/m_police.c
> @@ -301,7 +301,8 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg)
>   	    RTA_PAYLOAD(tb[TCA_POLICE_RATE64]) >= sizeof(rate64))
>   		rate64 = rta_getattr_u64(tb[TCA_POLICE_RATE64]);
>   
> -	print_uint(PRINT_ANY, "index", "\t index %u ", p->index);
> +	print_nl();
> +	print_uint(PRINT_ANY, "index", "\tindex %u ", p->index);
>   	tc_print_rate(PRINT_FP, NULL, "rate %s ", rate64);
>   	buffer = tc_calc_xmitsize(rate64, p->burst);
>   	print_size(PRINT_FP, NULL, "burst %s ", buffer);
> @@ -342,7 +343,7 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg)
>   		print_string(PRINT_FP, NULL, " ", NULL);
>   	}
>   
> -	print_uint(PRINT_ANY, "overhead", "overhead %u ", p->rate.overhead);
> +	print_size(PRINT_ANY, "overhead", "overhead %s ", p->rate.overhead);
>   	linklayer = (p->rate.linklayer & TC_LINKLAYER_MASK);
>   	if (linklayer > TC_LINKLAYER_ETHERNET || show_details)
>   		print_string(PRINT_ANY, "linklayer", "linklayer %s ",
> 

sorry forgot also the newline before ref. as Stephen Hemminger
pointed out. will send v2.