tc: Add space after format specifier

Add space after format specifier in print_string call. Fixes broken
qdisc tests within tdc testing suite. Per suggestion from Petr Machata,
remove a space and change spacing in tc/q_event.c to complete the fix.

Tested fix in tdc using:
./tdc.py -c qdisc

All qdisc RED tests return ok.

Fixes: d0e450438571("tc: q_red: Add support for qevents "mark" and "early_drop")
Signed-off-by: Briana Oursler <briana.oursler@gmail.com>
Tested-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/tc/q_red.c b/tc/q_red.c
index dfef1bf8663c59bc6e9300373a83dd22b9d7b421..df788f8fc5da133dc9141ad852a74591592e0a9f 100644 (file)
--- a/tc/q_red.c
+++ b/tc/q_red.c
@@ -222,12 +222,12 @@ static int red_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
        print_uint(PRINT_JSON, "min", NULL, qopt->qth_min);
        print_string(PRINT_FP, NULL, "min %s ", sprint_size(qopt->qth_min, b2));
        print_uint(PRINT_JSON, "max", NULL, qopt->qth_max);
-       print_string(PRINT_FP, NULL, "max %s", sprint_size(qopt->qth_max, b3));
+       print_string(PRINT_FP, NULL, "max %s ", sprint_size(qopt->qth_max, b3));
 
        tc_red_print_flags(qopt->flags);
 
        if (show_details) {
-               print_uint(PRINT_ANY, "ewma", " ewma %u ", qopt->Wlog);
+               print_uint(PRINT_ANY, "ewma", "ewma %u ", qopt->Wlog);
                if (max_P)
                        print_float(PRINT_ANY, "probability",
                                    "probability %lg ", max_P / pow(2, 32));

diff --git a/tc/tc_qevent.c b/tc/tc_qevent.c
index 2c010fcf752f0545ab6dca7e2e178f981d1e106e..34568070b5cad6a6f3fe220dee394605f6300951 100644 (file)
--- a/tc/tc_qevent.c
+++ b/tc/tc_qevent.c
@@ -82,8 +82,9 @@ void qevents_print(struct qevent_util *qevents, FILE *f)
                        }
 
                        open_json_object(NULL);
-                       print_string(PRINT_ANY, "kind", " qevent %s", qevents->id);
+                       print_string(PRINT_ANY, "kind", "qevent %s", qevents->id);
                        qevents->print_qevent(qevents, f);
+                       print_string(PRINT_FP, NULL, "%s", " ");
                        close_json_object();
                }
        }