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

[mirror_iproute2.git] / tc / q_htb.c

diff --git a/tc/q_htb.c b/tc/q_htb.c
index 10030a8741fa17efb316e8f871fdffcd5076a6dd..c609e9749c2c7778f67c2d7d21f947561ca42c2c 100644 (file)
--- a/tc/q_htb.c
+++ b/tc/q_htb.c
@@ -269,7 +269,6 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
        __u64 rate64, ceil64;
 
        SPRINT_BUF(b1);
-       SPRINT_BUF(b2);
        SPRINT_BUF(b3);
 
        if (opt == NULL)
@@ -310,18 +309,16 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
                if (linklayer > TC_LINKLAYER_ETHERNET || show_details)
                        fprintf(f, "linklayer %s ", sprint_linklayer(linklayer, b3));
                if (show_details) {
-                       fprintf(f, "burst %s/%u mpu %s ",
-                               sprint_size(buffer, b1),
-                               1<<hopt->rate.cell_log,
-                               sprint_size(hopt->rate.mpu, b2));
-                       fprintf(f, "cburst %s/%u mpu %s ",
-                               sprint_size(cbuffer, b1),
-                               1<<hopt->ceil.cell_log,
-                               sprint_size(hopt->ceil.mpu, b2));
+                       print_size(PRINT_FP, NULL, "burst %s/", buffer);
+                       fprintf(f, "%u ", 1<<hopt->rate.cell_log);
+                       print_size(PRINT_FP, NULL, "mpu %s ", hopt->rate.mpu);
+                       print_size(PRINT_FP, NULL, "cburst %s/", cbuffer);
+                       fprintf(f, "%u ", 1<<hopt->ceil.cell_log);
+                       print_size(PRINT_FP, NULL, "mpu %s ", hopt->ceil.mpu);
                        fprintf(f, "level %d ", (int)hopt->level);
                } else {
-                       fprintf(f, "burst %s ", sprint_size(buffer, b1));
-                       fprintf(f, "cburst %s ", sprint_size(cbuffer, b1));
+                       print_size(PRINT_FP, NULL, "burst %s ", buffer);
+                       print_size(PRINT_FP, NULL, "cburst %s ", cbuffer);
                }
                if (show_raw)
                        fprintf(f, "buffer [%08x] cbuffer [%08x] ",