rdma: make pretty behave like other commands

For tc, ip, etc the -pretty flag only has meaning if json
is used.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/rdma/rdma.c b/rdma/rdma.c
index 60ba8c0e559469bbb8afdcddb922a659cd1e0167..bee1985f96d8a37725c2599de94f2854d9d134ef 100644 (file)
--- a/rdma/rdma.c
+++ b/rdma/rdma.c
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
                               filename, version);
                        return EXIT_SUCCESS;
                case 'p':
-                       pretty = 1;
+                       ++pretty;
                        break;
                case 'd':
                        if (show_details)
@@ -153,7 +153,6 @@ int main(int argc, char **argv)
 
        rd.show_details = show_details;
        rd.show_driver_details = show_driver_details;
-       rd.pretty_output = pretty;
        rd.show_raw = show_raw;
 
        err = rd_init(&rd, filename);

diff --git a/rdma/rdma.h b/rdma/rdma.h
index f6830c851fb1d946ad437fe8c6ff49ebcc0db74b..f9308dbcfafd6002b0e609981ed615455f8b9b78 100644 (file)
--- a/rdma/rdma.h
+++ b/rdma/rdma.h
@@ -68,7 +68,6 @@ struct rd {
        struct nlmsghdr *nlh;
        char *buff;
        json_writer_t *jw;
-       int pretty_output;
        bool suppress_errors;
        struct list_head filter_list;
        char *link_name;

diff --git a/rdma/stat.c b/rdma/stat.c
index 6a3f8ca448927c4692bccae1ea5a4acb67ac69b8..b428a62ac707b2c477ab8a267b24102a2c092ab2 100644 (file)
--- a/rdma/stat.c
+++ b/rdma/stat.c
@@ -208,8 +208,7 @@ int res_get_hwcounters(struct rd *rd, struct nlattr *hwc_table, bool print)
 
                nm = mnl_attr_get_str(hw_line[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_NAME]);
                v = mnl_attr_get_u64(hw_line[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_VALUE]);
-               if (rd->pretty_output)
-                       newline_indent(rd);
+               newline_indent(rd);
                res_print_u64(rd, nm, v, hw_line[RDMA_NLDEV_ATTR_STAT_HWCOUNTER_ENTRY_NAME]);
        }
 
@@ -802,8 +801,7 @@ static int do_stat_mode_parse_cb(const struct nlmsghdr *nlh, void *data,
                        } else {
                                print_string(PRINT_FP, NULL, ",", NULL);
                        }
-                       if (rd->pretty_output)
-                               newline_indent(rd);
+                       newline_indent(rd);
 
                        print_string(PRINT_ANY, NULL, "%s", name);
                }

diff --git a/rdma/utils.c b/rdma/utils.c
index 32e12a64193a5b8bb33cb605c1a3b798888861d8..f332b2602e6fc4c02a976083f31efba438261a24 100644 (file)
--- a/rdma/utils.c
+++ b/rdma/utils.c
@@ -920,8 +920,7 @@ void print_driver_table(struct rd *rd, struct nlattr *tb)
        if (!rd->show_driver_details || !tb)
                return;
 
-       if (rd->pretty_output)
-               newline_indent(rd);
+       newline_indent(rd);
 
        /*
         * Driver attrs are tuples of {key, [print-type], value}.
@@ -933,8 +932,7 @@ void print_driver_table(struct rd *rd, struct nlattr *tb)
        mnl_attr_for_each_nested(tb_entry, tb) {
 
                if (cc > MAX_LINE_LENGTH) {
-                       if (rd->pretty_output)
-                               newline_indent(rd);
+                       newline_indent(rd);
                        cc = 0;
                }
                if (rd_attr_check(tb_entry, &type) != MNL_CB_OK)