Various cosmetic code changes

Nothing interesting here, except that things have to be cleaned
sometimes...

diff --git a/CHANGES b/CHANGES
index 49dd743c6145ab3c07eddc6bf79d0228e9ede4a5..413c9e21fd96a80baa60d6dee63437a12b2b4a87 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,8 @@ xxxx/xx/xx: Version 10.1.6 - Sebastien Godard (sysstat <at> orange.fr)
          to enter 'iostat -px 2 5' since no device name is given to
          option -p. This also concerns pidstat option -U.
        * Typos fixed. README file updated.
-       * Yet another cosmetic fix in pidstat manual page.
+       * Yet another cosmetic fix in pidstat manual page. Sar manual
+         page updated.
 
 2013/03/31: Version 10.1.5 - Sebastien Godard (sysstat <at> orange.fr)
        * mpstat now takes into account every interrupt per processor

diff --git a/man/sar.in b/man/sar.in
index b34ed8cb16c401ffcab03eefa556dd7503125546..bbb409215d06ed5a9e3c919ab52160ae5c8afcab 100644 (file)
--- a/man/sar.in
+++ b/man/sar.in
@@ -1,4 +1,4 @@
-.TH SAR 1 "SEPTEMBER 2012" Linux "Linux User's Manual" -*- nroff -*-
+.TH SAR 1 "MAY 2013" Linux "Linux User's Manual" -*- nroff -*-
 .SH NAME
 sar \- Collect, report, or save system activity information.
 .SH SYNOPSIS
@@ -1714,7 +1714,7 @@ Report memory statistics. The following values are displayed:
 .RS
 Number of memory pages freed by the system per second.
 A negative value represents a number of pages allocated by the system.
-Note that a page has a size of 4 kB or 8 kB according to the machine architecture.
+Note that a page has a size of 4 kiB or 8 kiB according to the machine architecture.
 .RE
 
 .B bufpg/s
@@ -1977,7 +1977,7 @@ Total number of context switches per second.
 .RE
 .RE
 .IP -y
-Report TTY device activity. The following values are displayed:
+Report TTY devices activity. The following values are displayed:
 
 .B rcvin/s
 .RS

diff --git a/sa.h b/sa.h
index cd16f1599472fd1b54490d6e901f0ec35e4d885c..d6c34efd81aaa286027e23cd388d4d3960d8a166 100644 (file)
--- a/sa.h
+++ b/sa.h
@@ -429,9 +429,10 @@ struct activity {
        unsigned int opt_flags;
        /*
         * Buffers that will contain the statistics read. Its size is @nr * @size each.
-        * [0]: used by sadc. Used by sar to save first collected stats (used later to
+        * [0]: used by sadc.
+        * [0] and [1]: current/previous statistics values (used by sar).
+        * [2]: Used by sar to save first collected stats (used later to
         * compute average).
-        * [1] and [2]: current/previous statistics values (used by sar).
         */
        void *buf[3];
        /*

diff --git a/sa_wrap.c b/sa_wrap.c
index 6a829d7e98b384ce557e5b43d39746583c605ad8..486ed228fa9e50207882b039512af506b255cb07 100644 (file)
--- a/sa_wrap.c
+++ b/sa_wrap.c
@@ -1067,7 +1067,7 @@ __nr_t wrap_get_usb_nr(struct activity *a)
 
        if ((n = get_usb_nr()) >= 0)
                /* Return a positive number even if no USB devices have been found */
-               return (n + NR_USB_PREALLOC);
+               return n + NR_USB_PREALLOC;
        
        return 0;
 }

diff --git a/sar.c b/sar.c
index ede71db053ab30773b84429dff47887f401a889f..06b459179c7d1abe0ecd9fc48092adf76a145aa4 100644 (file)
--- a/sar.c
+++ b/sar.c
@@ -131,7 +131,7 @@ void display_help(char *progname)
        printf(_("Main options and reports:\n"));
        printf(_("\t-b\tI/O and transfer rate statistics\n"));
        printf(_("\t-B\tPaging statistics\n"));
-       printf(_("\t-d\tBlock device statistics\n"));
+       printf(_("\t-d\tBlock devices statistics\n"));
        printf(_("\t-F\tFilesystems statistics\n"));
        printf(_("\t-H\tHugepages utilization statistics\n"));
        printf(_("\t-I { <int> | SUM | ALL | XALL }\n"
@@ -172,10 +172,10 @@ void display_help(char *progname)
        printf(_("\t-S\tSwap space utilization statistics\n"));
        printf(_("\t-u [ ALL ]\n"
                 "\t\tCPU utilization statistics\n"));
-       printf(_("\t-v\tKernel table statistics\n"));
+       printf(_("\t-v\tKernel tables statistics\n"));
        printf(_("\t-w\tTask creation and system switching statistics\n"));
        printf(_("\t-W\tSwapping statistics\n"));
-       printf(_("\t-y\tTTY device statistics\n"));
+       printf(_("\t-y\tTTY devices statistics\n"));
        exit(0);
 }