sar/sadc: Change variable name dis -> dish

Make it a bit longer to quiet LGTM.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/pr_stats.c b/pr_stats.c
index b8f24c650a6e40958441938493f9cc8605bda8da..4fbd5d1412033b282cc69cf8b56fed30cd315e90 100644 (file)
--- a/pr_stats.c
+++ b/pr_stats.c
@@ -37,7 +37,7 @@
 #endif
 
 extern unsigned int flags;
-extern int  dis;
+extern int  dish;
 extern char timestamp[][TIMESTAMP_LEN];
 extern unsigned long avg_count;
 
@@ -128,7 +128,7 @@ __print_funct_t print_cpu_stats(struct activity *a, int prev, int curr,
        struct stats_cpu *scc, *scp;
        unsigned char offline_cpu_bitmap[BITMAP_SIZE(NR_CPUS)] = {0};
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST + DISPLAY_CPU_ALL(a->opt_flags), 7, 9);
        }
 
@@ -283,7 +283,7 @@ __print_funct_t print_pcsw_stats(struct activity *a, int prev, int curr,
                *spc = (struct stats_pcsw *) a->buf[curr],
                *spp = (struct stats_pcsw *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -311,7 +311,7 @@ __print_funct_t print_irq_stats(struct activity *a, int prev, int curr,
        int i;
        struct stats_irq *sic, *sip;
 
-       if (dis || DISPLAY_ZERO_OMIT(flags)) {
+       if (dish || DISPLAY_ZERO_OMIT(flags)) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -372,7 +372,7 @@ __print_funct_t print_swap_stats(struct activity *a, int prev, int curr,
                *ssc = (struct stats_swap *) a->buf[curr],
                *ssp = (struct stats_swap *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -401,7 +401,7 @@ __print_funct_t print_paging_stats(struct activity *a, int prev, int curr,
                *spc = (struct stats_paging *) a->buf[curr],
                *spp = (struct stats_paging *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -443,7 +443,7 @@ __print_funct_t print_io_stats(struct activity *a, int prev, int curr,
                *sic = (struct stats_io *) a->buf[curr],
                *sip = (struct stats_io *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -515,7 +515,7 @@ void stub_print_memory_stats(struct activity *a, int prev, int curr, int dispavg
        }
 
        if (DISPLAY_MEMORY(a->opt_flags)) {
-               if (dis) {
+               if (dish) {
                        print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
                }
 
@@ -623,7 +623,7 @@ void stub_print_memory_stats(struct activity *a, int prev, int curr, int dispavg
        }
 
        if (DISPLAY_SWAP(a->opt_flags)) {
-               if (dis) {
+               if (dish) {
                        print_hdr_line(timestamp[!curr], a, SECOND, 0, 9);
                }
 
@@ -739,7 +739,7 @@ void stub_print_ktables_stats(struct activity *a, int curr, int dispavg)
                avg_pty_nr      = 0;
 
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -834,7 +834,7 @@ void stub_print_queue_stats(struct activity *a, int curr, int dispavg)
                avg_load_avg_15   = 0,
                avg_procs_blocked = 0;
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -932,7 +932,7 @@ __print_funct_t print_serial_stats(struct activity *a, int prev, int curr,
        int i, j, j0, found;
        struct stats_serial *ssc, *ssp;
 
-       if (dis || DISPLAY_ZERO_OMIT(flags)) {
+       if (dish || DISPLAY_ZERO_OMIT(flags)) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1025,7 +1025,7 @@ __print_funct_t print_disk_stats(struct activity *a, int prev, int curr,
                unit = UNIT_KILOBYTE;
        }
 
-       if (dis || DISPLAY_ZERO_OMIT(flags)) {
+       if (dish || DISPLAY_ZERO_OMIT(flags)) {
                print_hdr_line(timestamp[!curr], a, FIRST, DISPLAY_HUMAN_READ(flags) ? -1 : 0, 9);
        }
 
@@ -1117,7 +1117,7 @@ __print_funct_t print_net_dev_stats(struct activity *a, int prev, int curr,
                unit = UNIT_BYTE;
        }
 
-       if (dis || DISPLAY_ZERO_OMIT(flags)) {
+       if (dish || DISPLAY_ZERO_OMIT(flags)) {
                print_hdr_line(timestamp[!curr], a, FIRST, DISPLAY_HUMAN_READ(flags) ? -1 : 0, 9);
        }
 
@@ -1197,7 +1197,7 @@ __print_funct_t print_net_edev_stats(struct activity *a, int prev, int curr,
 
        memset(&snedzero, 0, STATS_NET_EDEV_SIZE);
 
-       if (dis || DISPLAY_ZERO_OMIT(flags)) {
+       if (dish || DISPLAY_ZERO_OMIT(flags)) {
                print_hdr_line(timestamp[!curr], a, FIRST, DISPLAY_HUMAN_READ(flags) ? -1 : 0, 9);
        }
 
@@ -1271,7 +1271,7 @@ __print_funct_t print_net_nfs_stats(struct activity *a, int prev, int curr,
                *snnc = (struct stats_net_nfs *) a->buf[curr],
                *snnp = (struct stats_net_nfs *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1304,7 +1304,7 @@ __print_funct_t print_net_nfsd_stats(struct activity *a, int prev, int curr,
                *snndc = (struct stats_net_nfsd *) a->buf[curr],
                *snndp = (struct stats_net_nfsd *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1347,7 +1347,7 @@ void stub_print_net_sock_stats(struct activity *a, int curr, int dispavg)
                avg_frag_inuse = 0,
                avg_tcp_tw     = 0;
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1441,7 +1441,7 @@ __print_funct_t print_net_ip_stats(struct activity *a, int prev, int curr,
                *snic = (struct stats_net_ip *) a->buf[curr],
                *snip = (struct stats_net_ip *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1476,7 +1476,7 @@ __print_funct_t print_net_eip_stats(struct activity *a, int prev, int curr,
                *sneic = (struct stats_net_eip *) a->buf[curr],
                *sneip = (struct stats_net_eip *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1511,7 +1511,7 @@ __print_funct_t print_net_icmp_stats(struct activity *a, int prev, int curr,
                *snic = (struct stats_net_icmp *) a->buf[curr],
                *snip = (struct stats_net_icmp *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1552,7 +1552,7 @@ __print_funct_t print_net_eicmp_stats(struct activity *a, int prev, int curr,
                *sneic = (struct stats_net_eicmp *) a->buf[curr],
                *sneip = (struct stats_net_eicmp *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1591,7 +1591,7 @@ __print_funct_t print_net_tcp_stats(struct activity *a, int prev, int curr,
                *sntc = (struct stats_net_tcp *) a->buf[curr],
                *sntp = (struct stats_net_tcp *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1622,7 +1622,7 @@ __print_funct_t print_net_etcp_stats(struct activity *a, int prev, int curr,
                *snetc = (struct stats_net_etcp *) a->buf[curr],
                *snetp = (struct stats_net_etcp *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1654,7 +1654,7 @@ __print_funct_t print_net_udp_stats(struct activity *a, int prev, int curr,
                *snuc = (struct stats_net_udp *) a->buf[curr],
                *snup = (struct stats_net_udp *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1688,7 +1688,7 @@ void stub_print_net_sock6_stats(struct activity *a, int curr, int dispavg)
                avg_raw6_inuse  = 0,
                avg_frag6_inuse = 0;
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1775,7 +1775,7 @@ __print_funct_t print_net_ip6_stats(struct activity *a, int prev, int curr,
                *snic = (struct stats_net_ip6 *) a->buf[curr],
                *snip = (struct stats_net_ip6 *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1812,7 +1812,7 @@ __print_funct_t print_net_eip6_stats(struct activity *a, int prev, int curr,
                *sneic = (struct stats_net_eip6 *) a->buf[curr],
                *sneip = (struct stats_net_eip6 *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1850,7 +1850,7 @@ __print_funct_t print_net_icmp6_stats(struct activity *a, int prev, int curr,
                *snic = (struct stats_net_icmp6 *) a->buf[curr],
                *snip = (struct stats_net_icmp6 *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1894,7 +1894,7 @@ __print_funct_t print_net_eicmp6_stats(struct activity *a, int prev, int curr,
                *sneic = (struct stats_net_eicmp6 *) a->buf[curr],
                *sneip = (struct stats_net_eicmp6 *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1932,7 +1932,7 @@ __print_funct_t print_net_udp6_stats(struct activity *a, int prev, int curr,
                *snuc = (struct stats_net_udp6 *) a->buf[curr],
                *snup = (struct stats_net_udp6 *) a->buf[prev];
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -1975,7 +1975,7 @@ void stub_print_pwr_cpufreq_stats(struct activity *a, int curr, int dispavg)
                nr_alloc = a->nr[curr];
        }
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 7, 9);
        }
 
@@ -2111,7 +2111,7 @@ void stub_print_pwr_fan_stats(struct activity *a, int curr, int dispavg)
                nr_alloc = a->nr[curr];
        }
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, -2, 9);
        }
 
@@ -2219,7 +2219,7 @@ void stub_print_pwr_temp_stats(struct activity *a, int curr, int dispavg)
                nr_alloc = a->nr[curr];
        }
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, -2, 9);
        }
 
@@ -2335,7 +2335,7 @@ void stub_print_pwr_in_stats(struct activity *a, int curr, int dispavg)
                nr_alloc = a->nr[curr];
        }
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, -2, 9);
        }
 
@@ -2441,7 +2441,7 @@ void stub_print_huge_stats(struct activity *a, int curr, int dispavg)
                unit = UNIT_KILOBYTE;
        }
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 0, 9);
        }
 
@@ -2540,7 +2540,7 @@ void print_pwr_wghfreq_stats(struct activity *a, int prev, int curr,
        struct stats_pwr_wghfreq *spc, *spp, *spc_k, *spp_k;
        unsigned long long tis, tisfreq;
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, 7, 9);
        }
 
@@ -2618,7 +2618,7 @@ void stub_print_pwr_usb_stats(struct activity *a, int curr, int dispavg)
        char fmt[16];
        struct stats_pwr_usb *suc, *sum;
 
-       if (dis) {
+       if (dish) {
                printf("\n%-11s     BUS  idvendor    idprod  maxpower",
                       (dispavg ? _("Summary:") : timestamp[!curr]));
                printf(" %-*s product\n", MAX_MANUF_LEN - 1, "manufact");
@@ -2731,7 +2731,7 @@ __print_funct_t stub_print_filesystem_stats(struct activity *a, int prev, int cu
                unit = UNIT_BYTE;
        }
 
-       if (dis || DISPLAY_ZERO_OMIT(flags)) {
+       if (dish || DISPLAY_ZERO_OMIT(flags)) {
                print_hdr_line((dispavg ? _("Summary:") : timestamp[!curr]),
                               a, FIRST + DISPLAY_MOUNT(a->opt_flags), -1, 9);
        }
@@ -2881,7 +2881,7 @@ __print_funct_t print_fchost_stats(struct activity *a, int prev, int curr,
        int i, j, j0, found;
        struct stats_fchost *sfcc, *sfcp;
 
-       if (dis) {
+       if (dish) {
                print_hdr_line(timestamp[!curr], a, FIRST, -1, 9);
        }
 
@@ -2953,7 +2953,7 @@ __print_funct_t print_softnet_stats(struct activity *a, int prev, int curr,
                *ssnp = (struct stats_softnet *) a->buf[prev];
        unsigned char offline_cpu_bitmap[BITMAP_SIZE(NR_CPUS)] = {0};
 
-       if (dis || DISPLAY_ZERO_OMIT(flags)) {
+       if (dish || DISPLAY_ZERO_OMIT(flags)) {
                print_hdr_line(timestamp[!curr], a, FIRST, 7, 9);
        }
 

diff --git a/sar.c b/sar.c
index 69bcd400220a94de1774b501a7acdec09b18164d..e19b115ae8cf1b5cb66728d0b595e31f93beacfa 100644 (file)
--- a/sar.c
+++ b/sar.c
@@ -48,7 +48,7 @@ char *sccsid(void) { return (SCCSID); }
 long interval = -1, count = 0;
 
 /* TRUE if a header line must be printed */
-int dis = TRUE;
+int dish = TRUE;
 /* TRUE if data read from file don't match current machine's endianness */
 int endian_mismatch = FALSE;
 /* TRUE if file's data come from a 64 bit machine */
@@ -548,7 +548,7 @@ void write_stats_startup(int curr)
        }
 
        flags |= S_F_SINCE_BOOT;
-       dis = TRUE;
+       dish = TRUE;
 
        write_stats(curr, USE_SADC, &count, NO_TM_START, NO_TM_END, NO_RESET,
                    ALL_ACTIVITIES, TRUE);
@@ -786,10 +786,10 @@ void handle_curr_act_stats(int ifd, off_t fpos, int *curr, long *cnt, int *eosaf
 
                if ((lines >= rows) || !lines) {
                        lines = 0;
-                       dis = 1;
+                       dish = 1;
                }
                else
-                       dis = 0;
+                       dish = 0;
 
                if (!*eosaf && (rtype != R_RESTART)) {
 
@@ -1199,8 +1199,8 @@ void read_stats(void)
 
                /* Print results */
                if (!dis_hdr) {
-                       dis = lines / rows;
-                       if (dis) {
+                       dish = lines / rows;
+                       if (dish) {
                                lines %= rows;
                        }
                        lines++;
@@ -1228,7 +1228,7 @@ void read_stats(void)
         * At least one line of stats must have been displayed for this.
         * (There may be no lines at all if we press Ctrl/C immediately).
         */
-       dis = dis_hdr;
+       dish = dis_hdr;
        if (avg_count) {
                write_stats_avg(curr, USE_SADC, ALL_ACTIVITIES);
        }