From: Sebastien GODARD Date: Sun, 19 Apr 2020 07:13:58 +0000 (+0200) Subject: sadf: Use actual number of items, not its pointer address X-Git-Tag: v12.3.3~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ef93e6f5471d36866cc70089808932f00666900;p=sysstat sadf: Use actual number of items, not its pointer address Signed-off-by: Sebastien GODARD --- diff --git a/json_stats.c b/json_stats.c index 82581eb..7479fe1 100644 --- a/json_stats.c +++ b/json_stats.c @@ -837,7 +837,7 @@ __print_funct_t json_print_net_dev_stats(struct activity *a, int curr, int tab, memset(&sndzero, 0, STATS_NET_DEV_SIZE); - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -923,7 +923,7 @@ __print_funct_t json_print_net_edev_stats(struct activity *a, int curr, int tab, struct stats_net_edev *snedc, *snedp, snedzero; int sep = FALSE; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; memset(&snedzero, 0, STATS_NET_EDEV_SIZE); @@ -1009,7 +1009,7 @@ __print_funct_t json_print_net_nfs_stats(struct activity *a, int curr, int tab, *snnc = (struct stats_net_nfs *) a->buf[curr], *snnp = (struct stats_net_nfs *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1054,7 +1054,7 @@ __print_funct_t json_print_net_nfsd_stats(struct activity *a, int curr, int tab, *snndc = (struct stats_net_nfsd *) a->buf[curr], *snndp = (struct stats_net_nfsd *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1108,7 +1108,7 @@ __print_funct_t json_print_net_sock_stats(struct activity *a, int curr, int tab, struct stats_net_sock *snsc = (struct stats_net_sock *) a->buf[curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1153,7 +1153,7 @@ __print_funct_t json_print_net_ip_stats(struct activity *a, int curr, int tab, *snic = (struct stats_net_ip *) a->buf[curr], *snip = (struct stats_net_ip *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1202,7 +1202,7 @@ __print_funct_t json_print_net_eip_stats(struct activity *a, int curr, int tab, *sneic = (struct stats_net_eip *) a->buf[curr], *sneip = (struct stats_net_eip *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1251,7 +1251,7 @@ __print_funct_t json_print_net_icmp_stats(struct activity *a, int curr, int tab, *snic = (struct stats_net_icmp *) a->buf[curr], *snip = (struct stats_net_icmp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1312,7 +1312,7 @@ __print_funct_t json_print_net_eicmp_stats(struct activity *a, int curr, int tab *sneic = (struct stats_net_eicmp *) a->buf[curr], *sneip = (struct stats_net_eicmp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1369,7 +1369,7 @@ __print_funct_t json_print_net_tcp_stats(struct activity *a, int curr, int tab, *sntc = (struct stats_net_tcp *) a->buf[curr], *sntp = (struct stats_net_tcp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1410,7 +1410,7 @@ __print_funct_t json_print_net_etcp_stats(struct activity *a, int curr, int tab, *snetc = (struct stats_net_etcp *) a->buf[curr], *snetp = (struct stats_net_etcp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1453,7 +1453,7 @@ __print_funct_t json_print_net_udp_stats(struct activity *a, int curr, int tab, *snuc = (struct stats_net_udp *) a->buf[curr], *snup = (struct stats_net_udp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1493,7 +1493,7 @@ __print_funct_t json_print_net_sock6_stats(struct activity *a, int curr, int tab struct stats_net_sock6 *snsc = (struct stats_net_sock6 *) a->buf[curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1534,7 +1534,7 @@ __print_funct_t json_print_net_ip6_stats(struct activity *a, int curr, int tab, *snic = (struct stats_net_ip6 *) a->buf[curr], *snip = (struct stats_net_ip6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1587,7 +1587,7 @@ __print_funct_t json_print_net_eip6_stats(struct activity *a, int curr, int tab, *sneic = (struct stats_net_eip6 *) a->buf[curr], *sneip = (struct stats_net_eip6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1642,7 +1642,7 @@ __print_funct_t json_print_net_icmp6_stats(struct activity *a, int curr, int tab *snic = (struct stats_net_icmp6 *) a->buf[curr], *snip = (struct stats_net_icmp6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1709,7 +1709,7 @@ __print_funct_t json_print_net_eicmp6_stats(struct activity *a, int curr, int ta *sneic = (struct stats_net_eicmp6 *) a->buf[curr], *sneip = (struct stats_net_eicmp6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); @@ -1764,7 +1764,7 @@ __print_funct_t json_print_net_udp6_stats(struct activity *a, int curr, int tab, *snuc = (struct stats_net_udp6 *) a->buf[curr], *snup = (struct stats_net_udp6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_json_markup; json_markup_network(tab, OPEN_JSON_MARKUP); diff --git a/xml_stats.c b/xml_stats.c index 2f6f74d..b3a0ef6 100644 --- a/xml_stats.c +++ b/xml_stats.c @@ -811,7 +811,7 @@ __print_funct_t xml_print_net_dev_stats(struct activity *a, int curr, int tab, struct stats_net_dev *sndc, *sndp, sndzero; double rxkb, txkb, ifutil; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; memset(&sndzero, 0, STATS_NET_DEV_SIZE); @@ -887,7 +887,7 @@ __print_funct_t xml_print_net_edev_stats(struct activity *a, int curr, int tab, int i, j; struct stats_net_edev *snedc, *snedp, snedzero; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; memset(&snedzero, 0, STATS_NET_EDEV_SIZE); @@ -962,7 +962,7 @@ __print_funct_t xml_print_net_nfs_stats(struct activity *a, int curr, int tab, *snnc = (struct stats_net_nfs *) a->buf[curr], *snnp = (struct stats_net_nfs *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1007,7 +1007,7 @@ __print_funct_t xml_print_net_nfsd_stats(struct activity *a, int curr, int tab, *snndc = (struct stats_net_nfsd *) a->buf[curr], *snndp = (struct stats_net_nfsd *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1061,7 +1061,7 @@ __print_funct_t xml_print_net_sock_stats(struct activity *a, int curr, int tab, struct stats_net_sock *snsc = (struct stats_net_sock *) a->buf[curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1106,7 +1106,7 @@ __print_funct_t xml_print_net_ip_stats(struct activity *a, int curr, int tab, *snic = (struct stats_net_ip *) a->buf[curr], *snip = (struct stats_net_ip *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1155,7 +1155,7 @@ __print_funct_t xml_print_net_eip_stats(struct activity *a, int curr, int tab, *sneic = (struct stats_net_eip *) a->buf[curr], *sneip = (struct stats_net_eip *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1204,7 +1204,7 @@ __print_funct_t xml_print_net_icmp_stats(struct activity *a, int curr, int tab, *snic = (struct stats_net_icmp *) a->buf[curr], *snip = (struct stats_net_icmp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1265,7 +1265,7 @@ __print_funct_t xml_print_net_eicmp_stats(struct activity *a, int curr, int tab, *sneic = (struct stats_net_eicmp *) a->buf[curr], *sneip = (struct stats_net_eicmp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1322,7 +1322,7 @@ __print_funct_t xml_print_net_tcp_stats(struct activity *a, int curr, int tab, *sntc = (struct stats_net_tcp *) a->buf[curr], *sntp = (struct stats_net_tcp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1363,7 +1363,7 @@ __print_funct_t xml_print_net_etcp_stats(struct activity *a, int curr, int tab, *snetc = (struct stats_net_etcp *) a->buf[curr], *snetp = (struct stats_net_etcp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1406,7 +1406,7 @@ __print_funct_t xml_print_net_udp_stats(struct activity *a, int curr, int tab, *snuc = (struct stats_net_udp *) a->buf[curr], *snup = (struct stats_net_udp *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1446,7 +1446,7 @@ __print_funct_t xml_print_net_sock6_stats(struct activity *a, int curr, int tab, struct stats_net_sock6 *snsc = (struct stats_net_sock6 *) a->buf[curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1487,7 +1487,7 @@ __print_funct_t xml_print_net_ip6_stats(struct activity *a, int curr, int tab, *snic = (struct stats_net_ip6 *) a->buf[curr], *snip = (struct stats_net_ip6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1540,7 +1540,7 @@ __print_funct_t xml_print_net_eip6_stats(struct activity *a, int curr, int tab, *sneic = (struct stats_net_eip6 *) a->buf[curr], *sneip = (struct stats_net_eip6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1595,7 +1595,7 @@ __print_funct_t xml_print_net_icmp6_stats(struct activity *a, int curr, int tab, *snic = (struct stats_net_icmp6 *) a->buf[curr], *snip = (struct stats_net_icmp6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1662,7 +1662,7 @@ __print_funct_t xml_print_net_eicmp6_stats(struct activity *a, int curr, int tab *sneic = (struct stats_net_eicmp6 *) a->buf[curr], *sneip = (struct stats_net_eicmp6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP); @@ -1717,7 +1717,7 @@ __print_funct_t xml_print_net_udp6_stats(struct activity *a, int curr, int tab, *snuc = (struct stats_net_udp6 *) a->buf[curr], *snup = (struct stats_net_udp6 *) a->buf[!curr]; - if (!IS_SELECTED(a->options) || (a->nr <= 0)) + if (!IS_SELECTED(a->options) || (a->nr[curr] <= 0)) goto close_xml_markup; xml_markup_network(tab, OPEN_XML_MARKUP);