Merge branch 'iproute2-master' into iproute2-next

[mirror_iproute2.git] / ip / iplink_hsr.c

diff --git a/ip/iplink_hsr.c b/ip/iplink_hsr.c
index 696b2c91369789b16e76fd6afdf0eb71f747bce1..c673ccf7727197a8d97ba2a90427f7a7ee774c04 100644 (file)
--- a/ip/iplink_hsr.c
+++ b/ip/iplink_hsr.c
@@ -110,30 +110,36 @@ static void hsr_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
            RTA_PAYLOAD(tb[IFLA_HSR_SUPERVISION_ADDR]) < ETH_ALEN)
                return;
 
-       fprintf(f, "slave1 ");
        if (tb[IFLA_HSR_SLAVE1])
-               fprintf(f, "%s ",
-                       ll_index_to_name(rta_getattr_u32(tb[IFLA_HSR_SLAVE1])));
+               print_string(PRINT_ANY,
+                            "slave1",
+                            "slave1 %s ",
+                            ll_index_to_name(rta_getattr_u32(tb[IFLA_HSR_SLAVE1])));
        else
-               fprintf(f, "<none> ");
+               print_null(PRINT_ANY, "slave1", "slave1 %s ", "<none>");
 
-       fprintf(f, "slave2 ");
        if (tb[IFLA_HSR_SLAVE2])
-               fprintf(f, "%s ",
-                       ll_index_to_name(rta_getattr_u32(tb[IFLA_HSR_SLAVE2])));
+               print_string(PRINT_ANY,
+                            "slave2",
+                            "slave2 %s ",
+                            ll_index_to_name(rta_getattr_u32(tb[IFLA_HSR_SLAVE2])));
        else
-               fprintf(f, "<none> ");
+               print_null(PRINT_ANY, "slave2", "slave2 %s ", "<none>");
 
        if (tb[IFLA_HSR_SEQ_NR])
-               fprintf(f, "sequence %d ",
-                       rta_getattr_u16(tb[IFLA_HSR_SEQ_NR]));
+               print_int(PRINT_ANY,
+                         "seq_nr",
+                         "sequence %d ",
+                         rta_getattr_u16(tb[IFLA_HSR_SEQ_NR]));
 
        if (tb[IFLA_HSR_SUPERVISION_ADDR])
-               fprintf(f, "supervision %s ",
-                       ll_addr_n2a(RTA_DATA(tb[IFLA_HSR_SUPERVISION_ADDR]),
-                                   RTA_PAYLOAD(tb[IFLA_HSR_SUPERVISION_ADDR]),
-                                   ARPHRD_VOID,
-                                   b1, sizeof(b1)));
+               print_string(PRINT_ANY,
+                            "supervision_addr",
+                            "supervision %s ",
+                            ll_addr_n2a(RTA_DATA(tb[IFLA_HSR_SUPERVISION_ADDR]),
+                                        RTA_PAYLOAD(tb[IFLA_HSR_SUPERVISION_ADDR]),
+                                        ARPHRD_VOID,
+                                        b1, sizeof(b1)));
 }
 
 static void hsr_print_help(struct link_util *lu, int argc, char **argv,