lib: Move sprint_size() from tc here, add print_size()

[mirror_iproute2.git] / tc / q_tbf.c

diff --git a/tc/q_tbf.c b/tc/q_tbf.c
index 9d483338552135011f7ab6147a004659fe3982af..4e5bf382fd03bc4b5f062df77fa23220fe75af61 100644 (file)
--- a/tc/q_tbf.c
+++ b/tc/q_tbf.c
@@ -292,13 +292,9 @@ static int tbf_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
                sprintf(b1, "%s/%u",  sprint_size(buffer, b2),
                        1 << qopt->rate.cell_log);
                print_string(PRINT_ANY, "burst", "burst %s ", b1);
-               print_uint(PRINT_JSON, "mpu", NULL, qopt->rate.mpu);
-               print_string(PRINT_FP, NULL, "mpu %s ",
-                            sprint_size(qopt->rate.mpu, b1));
+               print_size(PRINT_ANY, "mpu", "mpu %s ", qopt->rate.mpu);
        } else {
-               print_u64(PRINT_JSON, "burst", NULL, buffer);
-               print_string(PRINT_FP, NULL, "burst %s ",
-                            sprint_size(buffer, b1));
+               print_size(PRINT_ANY, "burst", "burst %s ", buffer);
        }
        if (show_raw)
                print_hex(PRINT_ANY, "burst_raw", "[%08x] ", qopt->buffer);
@@ -314,15 +310,11 @@ static int tbf_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
                                sprintf(b1, "%s/%u",  sprint_size(mtu, b2),
                                        1 << qopt->peakrate.cell_log);
                                print_string(PRINT_ANY, "mtu", "mtu %s ", b1);
-                               print_uint(PRINT_JSON, "mpu", NULL,
+                               print_size(PRINT_ANY, "mpu", "mpu %s ",
                                           qopt->peakrate.mpu);
-                               print_string(PRINT_FP, NULL, "mpu %s ",
-                                            sprint_size(qopt->peakrate.mpu,
-                                                        b1));
                        } else {
-                               print_u64(PRINT_JSON, "minburst", NULL, mtu);
-                               print_string(PRINT_FP, NULL, "minburst %s ",
-                                            sprint_size(mtu, b1));
+                               print_size(PRINT_ANY, "minburst",
+                                          "minburst %s ", mtu);
                        }
                        if (show_raw)
                                print_hex(PRINT_ANY, "mtu_raw", "[%08x] ",
@@ -344,11 +336,8 @@ static int tbf_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
                print_string(PRINT_FP, NULL, "lat %s ",
                             sprint_time(latency, b1));
        }
-       if (show_raw || latency < 0.0) {
-               print_uint(PRINT_JSON, "limit", NULL, qopt->limit);
-               print_string(PRINT_FP, NULL, "limit %s ",
-                            sprint_size(qopt->limit, b1));
-       }
+       if (show_raw || latency < 0.0)
+               print_size(PRINT_ANY, "limit", "limit %s ", qopt->limit);
        if (qopt->rate.overhead)
                print_int(PRINT_ANY, "overhead", "overhead %d ",
                          qopt->rate.overhead);