sadf: Cosmetic changes

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

diff --git a/raw_stats.c b/raw_stats.c
index ec7586c6ee1ee15a8ba9d19cfa1b36430d860fc9..73c80ac92057de0e773e400091cfaae23ea69640 100644 (file)
--- a/raw_stats.c
+++ b/raw_stats.c
@@ -1678,14 +1678,14 @@ __print_funct_t raw_print_softnet_stats(struct activity *a, char *timestr, int c
 __print_funct_t raw_print_psicpu_stats(struct activity *a, char *timestr, int curr)
 {
        struct stats_psi_cpu
-               *spic = (struct stats_psi_cpu *) a->buf[curr],
-               *spip = (struct stats_psi_cpu *) a->buf[!curr];
+               *psic = (struct stats_psi_cpu *) a->buf[curr],
+               *psip = (struct stats_psi_cpu *) a->buf[!curr];
 
-       printf("%s; %s; %lu;", timestr, pfield(a->hdr_line, FIRST), spic->some_acpu_10);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->some_acpu_60);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->some_acpu_300);
+       printf("%s; %s; %lu;", timestr, pfield(a->hdr_line, FIRST), psic->some_acpu_10);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->some_acpu_60);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->some_acpu_300);
        printf(" %s", pfield(NULL, 0));
-       pval((unsigned long long) spip->some_cpu_total, (unsigned long long) spic->some_cpu_total);
+       pval((unsigned long long) psip->some_cpu_total, (unsigned long long) psic->some_cpu_total);
        printf("\n");
 }
 
@@ -1702,20 +1702,20 @@ __print_funct_t raw_print_psicpu_stats(struct activity *a, char *timestr, int cu
 __print_funct_t raw_print_psiio_stats(struct activity *a, char *timestr, int curr)
 {
        struct stats_psi_io
-               *spic = (struct stats_psi_io *) a->buf[curr],
-               *spip = (struct stats_psi_io *) a->buf[!curr];
+               *psic = (struct stats_psi_io *) a->buf[curr],
+               *psip = (struct stats_psi_io *) a->buf[!curr];
 
-       printf("%s; %s; %lu;", timestr, pfield(a->hdr_line, FIRST), spic->some_aio_10);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->some_aio_60);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->some_aio_300);
+       printf("%s; %s; %lu;", timestr, pfield(a->hdr_line, FIRST), psic->some_aio_10);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->some_aio_60);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->some_aio_300);
        printf(" %s", pfield(NULL, 0));
-       pval((unsigned long long) spip->some_io_total, (unsigned long long) spic->some_io_total);
+       pval((unsigned long long) psip->some_io_total, (unsigned long long) psic->some_io_total);
 
-       printf(" %s; %lu;", pfield(NULL, 0), spic->full_aio_10);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->full_aio_60);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->full_aio_300);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->full_aio_10);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->full_aio_60);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->full_aio_300);
        printf(" %s", pfield(NULL, 0));
-       pval((unsigned long long) spip->full_io_total, (unsigned long long) spic->full_io_total);
+       pval((unsigned long long) psip->full_io_total, (unsigned long long) psic->full_io_total);
        printf("\n");
 }
 
@@ -1732,19 +1732,19 @@ __print_funct_t raw_print_psiio_stats(struct activity *a, char *timestr, int cur
 __print_funct_t raw_print_psimem_stats(struct activity *a, char *timestr, int curr)
 {
        struct stats_psi_mem
-               *spic = (struct stats_psi_mem *) a->buf[curr],
-               *spip = (struct stats_psi_mem *) a->buf[!curr];
+               *psic = (struct stats_psi_mem *) a->buf[curr],
+               *psip = (struct stats_psi_mem *) a->buf[!curr];
 
-       printf("%s; %s; %lu;", timestr, pfield(a->hdr_line, FIRST), spic->some_amem_10);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->some_amem_60);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->some_amem_300);
+       printf("%s; %s; %lu;", timestr, pfield(a->hdr_line, FIRST), psic->some_amem_10);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->some_amem_60);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->some_amem_300);
        printf(" %s", pfield(NULL, 0));
-       pval((unsigned long long) spip->some_mem_total, (unsigned long long) spic->some_mem_total);
+       pval((unsigned long long) psip->some_mem_total, (unsigned long long) psic->some_mem_total);
 
-       printf(" %s; %lu;", pfield(NULL, 0), spic->full_amem_10);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->full_amem_60);
-       printf(" %s; %lu;", pfield(NULL, 0), spic->full_amem_300);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->full_amem_10);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->full_amem_60);
+       printf(" %s; %lu;", pfield(NULL, 0), psic->full_amem_300);
        printf(" %s", pfield(NULL, 0));
-       pval((unsigned long long) spip->full_mem_total, (unsigned long long) spic->full_mem_total);
+       pval((unsigned long long) psip->full_mem_total, (unsigned long long) psic->full_mem_total);
        printf("\n");
 }

diff --git a/rndr_stats.c b/rndr_stats.c
index 2cff9cc9bb11768377b84c62564cf847ffcf2c56..16389de9b8e63e6f4db91a61cae457bb010eb394 100644 (file)
--- a/rndr_stats.c
+++ b/rndr_stats.c
@@ -3210,33 +3210,33 @@ __print_funct_t render_psicpu_stats(struct activity *a, int isdb, char *pre,
                                    int curr, unsigned long long itv)
 {
        struct stats_psi_cpu
-               *spic = (struct stats_psi_cpu *) a->buf[curr],
-               *spip = (struct stats_psi_cpu *) a->buf[!curr];
+               *psic = (struct stats_psi_cpu *) a->buf[curr],
+               *psip = (struct stats_psi_cpu *) a->buf[!curr];
        int pt_newlin
                = (DISPLAY_HORIZONTALLY(flags) ? PT_NOFLAG : PT_NEWLIN);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_acpu10", NULL, NULL,
               NOVAL,
-              (double) spic->some_acpu_10 / 100,
+              (double) psic->some_acpu_10 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_acpu60", NULL, NULL,
               NOVAL,
-              (double) spic->some_acpu_60 / 100,
+              (double) psic->some_acpu_60 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_acpu300", NULL, NULL,
               NOVAL,
-              (double) spic->some_acpu_300 / 100,
+              (double) psic->some_acpu_300 / 100,
               NULL);
 
        render(isdb, pre, pt_newlin,
               "-\ts_tcpu/s", NULL, NULL,
               NOVAL,
-              S_VALUE(spip->some_cpu_total, spic->some_cpu_total, itv),
+              S_VALUE(psip->some_cpu_total, psic->some_cpu_total, itv),
               NULL);
 }
 
@@ -3256,57 +3256,57 @@ __print_funct_t render_psiio_stats(struct activity *a, int isdb, char *pre,
                                   int curr, unsigned long long itv)
 {
        struct stats_psi_io
-               *spic = (struct stats_psi_io *) a->buf[curr],
-               *spip = (struct stats_psi_io *) a->buf[!curr];
+               *psic = (struct stats_psi_io *) a->buf[curr],
+               *psip = (struct stats_psi_io *) a->buf[!curr];
        int pt_newlin
                = (DISPLAY_HORIZONTALLY(flags) ? PT_NOFLAG : PT_NEWLIN);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_aio10", NULL, NULL,
               NOVAL,
-              (double) spic->some_aio_10 / 100,
+              (double) psic->some_aio_10 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_aio60", NULL, NULL,
               NOVAL,
-              (double) spic->some_aio_60 / 100,
+              (double) psic->some_aio_60 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_aio300", NULL, NULL,
               NOVAL,
-              (double) spic->some_aio_300 / 100,
+              (double) psic->some_aio_300 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_tio/s", NULL, NULL,
               NOVAL,
-              S_VALUE(spip->some_io_total, spic->some_io_total, itv),
+              S_VALUE(psip->some_io_total, psic->some_io_total, itv),
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\tf_aio10", NULL, NULL,
               NOVAL,
-              (double) spic->full_aio_10 / 100,
+              (double) psic->full_aio_10 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\tf_aio60", NULL, NULL,
               NOVAL,
-              (double) spic->full_aio_60 / 100,
+              (double) psic->full_aio_60 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\tf_aio300", NULL, NULL,
               NOVAL,
-              (double) spic->full_aio_300 / 100,
+              (double) psic->full_aio_300 / 100,
               NULL);
 
        render(isdb, pre, pt_newlin,
               "-\tf_tio/s", NULL, NULL,
               NOVAL,
-              S_VALUE(spip->full_io_total, spic->full_io_total, itv),
+              S_VALUE(psip->full_io_total, psic->full_io_total, itv),
               NULL);
 }
 
@@ -3326,56 +3326,56 @@ __print_funct_t render_psimem_stats(struct activity *a, int isdb, char *pre,
                                    int curr, unsigned long long itv)
 {
        struct stats_psi_mem
-               *spic = (struct stats_psi_mem *) a->buf[curr],
-               *spip = (struct stats_psi_mem *) a->buf[!curr];
+               *psic = (struct stats_psi_mem *) a->buf[curr],
+               *psip = (struct stats_psi_mem *) a->buf[!curr];
        int pt_newlin
                = (DISPLAY_HORIZONTALLY(flags) ? PT_NOFLAG : PT_NEWLIN);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_amem10", NULL, NULL,
               NOVAL,
-              (double) spic->some_amem_10 / 100,
+              (double) psic->some_amem_10 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_amem60", NULL, NULL,
               NOVAL,
-              (double) spic->some_amem_60 / 100,
+              (double) psic->some_amem_60 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_amem300", NULL, NULL,
               NOVAL,
-              (double) spic->some_amem_300 / 100,
+              (double) psic->some_amem_300 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\ts_tmem/s", NULL, NULL,
               NOVAL,
-              S_VALUE(spip->some_mem_total, spic->some_mem_total, itv),
+              S_VALUE(psip->some_mem_total, psic->some_mem_total, itv),
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\tf_amem10", NULL, NULL,
               NOVAL,
-              (double) spic->full_amem_10 / 100,
+              (double) psic->full_amem_10 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\tf_amem60", NULL, NULL,
               NOVAL,
-              (double) spic->full_amem_60 / 100,
+              (double) psic->full_amem_60 / 100,
               NULL);
 
        render(isdb, pre, PT_NOFLAG,
               "-\tf_amem300", NULL, NULL,
               NOVAL,
-              (double) spic->full_amem_300 / 100,
+              (double) psic->full_amem_300 / 100,
               NULL);
 
        render(isdb, pre, pt_newlin,
               "-\tf_tmem/s", NULL, NULL,
               NOVAL,
-              S_VALUE(spip->full_mem_total, spic->full_mem_total, itv),
+              S_VALUE(psip->full_mem_total, psic->full_mem_total, itv),
               NULL);
 }