Merge branch 'pschiffe-master'

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

diff --cc pr_stats.c
index 7e52927195c4be0ef8e4db466a24d9ebdc19f2d8,ffd4bf33482b4848dd81815bb587d2f257afe518..9b6540be5594e8c95c387b4e8e76e2fb71242f99
--- 1/pr_stats.c
--- 2/pr_stats.c
+++ b/pr_stats.c
@@@ -563,15 -563,14 +563,14 @@@ void stub_print_memory_stats(struct act
                               (double) avg_frskb / avg_count,
                               ((double) avg_tlskb / avg_count) -
                               ((double) avg_frskb / avg_count),
-                              ((double) (avg_tlskb / avg_count)) ?
-                              SP_VALUE((double) (avg_frskb / avg_count),
-                                       (double) (avg_tlskb / avg_count),
-                                       (double) (avg_tlskb / avg_count)) :
 -                             (avg_tlskb >= avg_count) ?
++                             avg_tlskb ?
+                              SP_VALUE((double) avg_frskb / avg_count,
+                                       (double) avg_tlskb / avg_count,
+                                       (double) avg_tlskb / avg_count) :
                               0.0,
-                              (double) (avg_caskb / avg_count),
-                              (((double) avg_tlskb / avg_count) -
-                               ((double) avg_frskb / avg_count)) ?
-                              SP_VALUE(0.0, (double) (avg_caskb / avg_count),
+                              (double) avg_caskb / avg_count,
+                              (avg_tlskb != avg_frskb) ?
+                              SP_VALUE(0.0, (double) avg_caskb / avg_count,
                                        ((double) avg_tlskb / avg_count) -
                                        ((double) avg_frskb / avg_count)) :
                               0.0);
@@@ -2249,10 -2248,10 +2248,10 @@@ void stub_print_huge_stats(struct activ
                       (double) avg_frhkb / avg_count,
                       ((double) avg_tlhkb / avg_count) -
                       ((double) avg_frhkb / avg_count),
-                      ((double) (avg_tlhkb / avg_count)) ?
-                      SP_VALUE((double) (avg_frhkb / avg_count),
-                               (double) (avg_tlhkb / avg_count),
-                               (double) (avg_tlhkb / avg_count)) :
 -                     (avg_tlhkb >= avg_count) ?
++                     avg_tlhkb ?
+                      SP_VALUE((double) avg_frhkb / avg_count,
+                               (double) avg_tlhkb / avg_count,
+                               (double) avg_tlhkb / avg_count) :
                       0.0);
  
                /* Reset average counters */