rdma: Unify netlink attribute checks prior to prints

[mirror_iproute2.git] / rdma / res.c

diff --git a/rdma/res.c b/rdma/res.c
index 140c0908ee6fa9e10206200fa9c6303ff1947746..564af9b4d7b4175589913dc1b464096dc030a15a 100644 (file)
--- a/rdma/res.c
+++ b/rdma/res.c
@@ -47,7 +47,9 @@ static int res_print_summary(struct rd *rd, struct nlattr **tb)
 
                name = mnl_attr_get_str(nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_NAME]);
                curr = mnl_attr_get_u64(nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR]);
-               res_print_uint(rd, name, curr);
+               res_print_uint(
+                       rd, name, curr,
+                       nla_line[RDMA_NLDEV_ATTR_RES_SUMMARY_ENTRY_CURR]);
        }
        return 0;
 }
@@ -188,16 +190,24 @@ char *get_task_name(uint32_t pid)
        return comm;
 }
 
-void print_key(struct rd *rd, const char *name, uint64_t val)
+void print_key(struct rd *rd, const char *name, uint64_t val,
+              struct nlattr *nlattr)
 {
+       if (!nlattr)
+               return;
+
        if (rd->json_output)
                jsonw_xint_field(rd->jw, name, val);
        else
                pr_out("%s 0x%" PRIx64 " ", name, val);
 }
 
-void res_print_uint(struct rd *rd, const char *name, uint64_t val)
+void res_print_uint(struct rd *rd, const char *name, uint64_t val,
+                   struct nlattr *nlattr)
 {
+       if (!nlattr)
+               return;
+
        if (rd->json_output)
                jsonw_u64_field(rd->jw, name, val);
        else