Subject: Re: [PATCH iproute2-next] tc: jsonify output of q_fifo

From: Stephen Hemminger <[email-masked]>
Date: Thu, 4 Oct 2018 17:10:58 -0700

On Thu,  4 Oct 2018 17:08:34 -0700
Jakub Kicinski <[email-masked]> wrote:

> Print limits correctly in JSON context.
> 
> Signed-off-by: Jakub Kicinski <[email-masked]>
> ---
>  tc/q_fifo.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/tc/q_fifo.c b/tc/q_fifo.c
> index cb86a404d4de..61493fbbc5bc 100644
> --- a/tc/q_fifo.c
> +++ b/tc/q_fifo.c
> @@ -69,9 +69,12 @@ static int fifo_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
>  	qopt = RTA_DATA(opt);
>  	if (strcmp(qu->id, "bfifo") == 0) {
>  		SPRINT_BUF(b1);
> -		fprintf(f, "limit %s", sprint_size(qopt->limit, b1));
> -	} else
> -		fprintf(f, "limit %up", qopt->limit);
> +		print_uint(PRINT_JSON, "limit", NULL, qopt->limit);
> +		print_string(PRINT_FP, NULL, "limit %s",
> +			     sprint_size(qopt->limit, b1));
> +	} else {
> +		print_uint(PRINT_ANY, "limit", "limit %up", qopt->limit);
> +	}
>  	return 0;
>  }
>  

This can go to current not net-next, since it is a bug fix really.