Files dependencies: Global update

Update files included in source files.
Update Makefile to be consistent with files dependencies.
Move also some code from common.c to rd_stats.c.

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

diff --git a/Makefile.in b/Makefile.in
index 3cd79403460558d449658cf7b2113a963da9ef44..edaea3fef86e041000342529c2c6674e1b2e859b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -172,22 +172,22 @@ NLSPOT= $(NLSPO:.po=.pot)
 
 all: sadc sar sadf iostat tapestat mpstat pidstat cifsiostat locales
 
-common.o: common.c version.h common.h ioconf.h sysconfig.h
+common.o: common.c version.h common.h
 
-sa_common.o: sa_common.c sa.h common.h ioconf.h sysconfig.h rd_stats.h
+sa_common.o: sa_common.c version.h sa.h common.h rd_stats.h rd_sensors.h ioconf.h sysconfig.h
 
 ioconf.o: ioconf.c ioconf.h common.h sysconfig.h
 
-act_sadc.o: activity.c sa.h rd_stats.h rd_sensors.h
+act_sadc.o: activity.c sa.h common.h rd_stats.h rd_sensors.h
        $(CC) -o $@ -c $(CFLAGS) -DSOURCE_SADC $(DFLAGS) $<
 
-act_sar.o: activity.c sa.h rd_stats.h rd_sensors.h pr_stats.h
+act_sar.o: activity.c sa.h common.h rd_stats.h rd_sensors.h pr_stats.h
        $(CC) -o $@ -c $(CFLAGS) -DSOURCE_SAR $(DFLAGS) $<
 
-act_sadf.o: activity.c sa.h rd_stats.h rd_sensors.h rndr_stats.h xml_stats.h json_stats.h svg_stats.h raw_stats.h
+act_sadf.o: activity.c sa.h common.h rd_stats.h rd_sensors.h rndr_stats.h xml_stats.h json_stats.h svg_stats.h raw_stats.h
        $(CC) -o $@ -c $(CFLAGS) -DSOURCE_SADF $(DFLAGS) $<
 
-rd_stats.o: rd_stats.c common.h rd_stats.h ioconf.h sysconfig.h
+rd_stats.o: rd_stats.c common.h rd_stats.h
        $(CC) -o $@ -c $(CFLAGS) -DSOURCE_SADC $(DFLAGS) $<
 
 rd_stats_light.o: rd_stats.c common.h rd_stats.h ioconf.h sysconfig.h
@@ -199,31 +199,32 @@ count.o: count.c common.h rd_stats.h
 count_light.o: count.c common.h rd_stats.h
        $(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $<
 
-rd_sensors.o: rd_sensors.c common.h rd_sensors.h rd_stats.h sysconfig.h
+rd_sensors.o: rd_sensors.c common.h rd_sensors.h rd_stats.h
 
-pr_stats.o: pr_stats.c sa.h ioconf.h sysconfig.h pr_stats.h
+pr_stats.o: pr_stats.c sa.h common.h rd_stats.h rd_sensors.h ioconf.h sysconfig.h pr_stats.h
 
-rndr_stats.o: rndr_stats.c sa.h ioconf.h sysconfig.h rndr_stats.h
+rndr_stats.o: rndr_stats.c sa.h common.h rd_stats.h rd_sensors.h ioconf.h sysconfig.h rndr_stats.h
 
-xml_stats.o: xml_stats.c sa.h sadf.h ioconf.h sysconfig.h xml_stats.h
+xml_stats.o: xml_stats.c sa.h common.h rd_stats.h rd_sensors.h ioconf.h sysconfig.h xml_stats.h
 
-json_stats.o: json_stats.c sa.h sadf.h ioconf.h sysconfig.h json_stats.h
+json_stats.o: json_stats.c sa.h common.h rd_stats.h rd_sensors.h ioconf.h sysconfig.h json_stats.h
 
-svg_stats.o: svg_stats.c sa.h sadf.h ioconf.h sysconfig.h svg_stats.h
+svg_stats.o: svg_stats.c sa.h common.h rd_stats.h rd_sensors.h ioconf.h sysconfig.h svg_stats.h
 
-raw_stats.o: raw_stats.c sa.h sadf.h ioconf.h sysconfig.h raw_stats.h
+raw_stats.o: raw_stats.c sa.h common.h rd_stats.h rd_sensors.h ioconf.h sysconfig.h raw_stats.h
 
-sa_wrap.o: sa_wrap.c sa.h rd_stats.h count.h rd_sensors.h
+sa_wrap.o: sa_wrap.c sa.h common.h rd_stats.h count.h rd_sensors.h
+       $(CC) -o $@ -c $(CFLAGS) -DSOURCE_SADC $(DFLAGS) $<
 
-format_sadf.o: format.c sadf.h
+format_sadf.o: format.c sadf.h sa.h common.h rd_stats.h rd_sensors.h
        $(CC) -o $@ -c $(CFLAGS) -DSOURCE_SADF $(DFLAGS) $<
 
-format_sar.o: format.c sa.h
+format_sar.o: format.c sa.h common.h rd_stats.h rd_sensors.h
        $(CC) -o $@ -c $(CFLAGS) -DSOURCE_SAR $(DFLAGS) $<
 
-sadf_misc.o: sadf_misc.c sadf.h sa.h
+sadf_misc.o: sadf_misc.c sadf.h sa.h common.h rd_stats.h rd_sensors.h
 
-sa_conv.o: sa_conv.c sadf.h sa.h sa_conv.h
+sa_conv.o: sa_conv.c version.h sadf.h sa.h common.h rd_stats.h rd_sensors.h sa_conv.h
 
 # Explicit rules needed to prevent possible file corruption
 # when using parallel execution.
@@ -241,24 +242,24 @@ librdstats_light.a: rd_stats_light.o count_light.o
 librdsensors.a: rd_sensors.o
        $(AR) rvs $@ $?
 
-sadc.o: sadc.c sa.h version.h common.h ioconf.h sysconfig.h rd_stats.h rd_sensors.h
+sadc.o: sadc.c sa.h version.h common.h rd_stats.h rd_sensors.h
 
 sadc: LFLAGS += $(LFSENSORS)
 sadc: sadc.o act_sadc.o sa_wrap.o sa_common.o librdstats.a librdsensors.a libsyscom.a
 
-sar.o: sar.c sa.h version.h common.h ioconf.h pr_stats.h sysconfig.h
+sar.o: sar.c sa.h version.h common.h rd_stats.h rd_sensors.h
 
-sar: sar.o act_sar.o format_sar.o sa_common.o pr_stats.o libsyscom.a
+sar: sar.o act_sar.o format_sar.o sa_common.o pr_stats.o librdstats_light.a libsyscom.a
 
-sadf.o: sadf.c sadf.h version.h sa.h common.h ioconf.h sysconfig.h
+sadf.o: sadf.c sadf.h version.h sa.h common.h rd_stats.h rd_sensors.h
 
-sadf: sadf.o act_sadf.o format_sadf.o sadf_misc.o sa_conv.o rndr_stats.o xml_stats.o json_stats.o svg_stats.o raw_stats.o sa_common.o libsyscom.a
+sadf: sadf.o act_sadf.o format_sadf.o sadf_misc.o sa_conv.o rndr_stats.o xml_stats.o json_stats.o svg_stats.o raw_stats.o sa_common.o librdstats_light.a libsyscom.a
 
 iostat.o: iostat.c iostat.h version.h common.h ioconf.h sysconfig.h rd_stats.h count.h
 
 iostat: iostat.o librdstats_light.a libsyscom.a
 
-tapestat.o: tapestat.c tapestat.h version.h common.h count.h
+tapestat.o: tapestat.c tapestat.h version.h common.h count.h rd_stats.h
 
 tapestat: tapestat.o librdstats_light.a libsyscom.a
 
@@ -270,7 +271,7 @@ mpstat.o: mpstat.c mpstat.h version.h common.h rd_stats.h count.h
 
 mpstat: mpstat.o librdstats_light.a libsyscom.a
 
-cifsiostat.o: cifsiostat.c cifsiostat.h count.h version.h common.h
+cifsiostat.o: cifsiostat.c cifsiostat.h count.h rd_stats.h version.h common.h
 
 cifsiostat: cifsiostat.o librdstats_light.a libsyscom.a
 

diff --git a/activity.c b/activity.c
index 9dac98257fd326808403b73042a9552797b37732..867dbc4469c710bd17f445020dcf3abe33a59e47 100644 (file)
--- a/activity.c
+++ b/activity.c
@@ -21,9 +21,6 @@
 
 #include "sa.h"
 
-#include "rd_stats.h"
-#include "rd_sensors.h"
-
 #ifdef SOURCE_SAR
 #include "pr_stats.h"
 #endif

diff --git a/cifsiostat.c b/cifsiostat.c
index c745f39f928357208f96ed4391e3c94da5c1e429..daf9dbcbd467b52da4ad628485b47d6a24522628 100644 (file)
--- a/cifsiostat.c
+++ b/cifsiostat.c
@@ -30,8 +30,8 @@
 
 #include "version.h"
 #include "cifsiostat.h"
+#include "rd_stats.h"
 #include "count.h"
-#include "common.h"
 
 #ifdef USE_NLS
 #include <locale.h>

diff --git a/common.c b/common.c
index fc4d05b5ecdb529a5ea7cb49b8c6e1e65ade6a1e..987dff26d167c1483aa08f49c83b413dbc16d1f9 100644 (file)
--- a/common.c
+++ b/common.c
@@ -35,8 +35,6 @@
 
 #include "version.h"
 #include "common.h"
-#include "ioconf.h"
-#include "rd_stats.h"
 
 #ifdef USE_NLS
 #include <locale.h>
@@ -688,77 +686,6 @@ unsigned long long get_interval(unsigned long long prev_uptime,
        return itv;
 }
 
-/*
- ***************************************************************************
- * Since ticks may vary slightly from CPU to CPU, we'll want
- * to recalculate itv based on this CPU's tick count, rather
- * than that reported by the "cpu" line. Otherwise we
- * occasionally end up with slightly skewed figures, with
- * the skew being greater as the time interval grows shorter.
- *
- * IN:
- * @scc        Current sample statistics for current CPU.
- * @scp        Previous sample statistics for current CPU.
- *
- * RETURNS:
- * Interval of time based on current CPU, expressed in jiffies.
- ***************************************************************************
- */
-unsigned long long get_per_cpu_interval(struct stats_cpu *scc,
-                                       struct stats_cpu *scp)
-{
-       unsigned long long ishift = 0LL;
-
-       if ((scc->cpu_user - scc->cpu_guest) < (scp->cpu_user - scp->cpu_guest)) {
-               /*
-                * Sometimes the nr of jiffies spent in guest mode given by the guest
-                * counter in /proc/stat is slightly higher than that included in
-                * the user counter. Update the interval value accordingly.
-                */
-               ishift += (scp->cpu_user - scp->cpu_guest) -
-                         (scc->cpu_user - scc->cpu_guest);
-       }
-       if ((scc->cpu_nice - scc->cpu_guest_nice) < (scp->cpu_nice - scp->cpu_guest_nice)) {
-               /*
-                * Idem for nr of jiffies spent in guest_nice mode.
-                */
-               ishift += (scp->cpu_nice - scp->cpu_guest_nice) -
-                         (scc->cpu_nice - scc->cpu_guest_nice);
-       }
-
-       /*
-        * Workaround for CPU coming back online: With recent kernels
-        * some fields (user, nice, system) restart from their previous value,
-        * whereas others (idle, iowait) restart from zero.
-        * For the latter we need to set their previous value to zero to
-        * avoid getting an interval value < 0.
-        * (I don't know how the other fields like hardirq, steal... behave).
-        * Don't assume the CPU has come back from offline state if previous
-        * value was greater than ULLONG_MAX & 0x80000 (the counter probably
-        * overflew).
-        */
-       if ((scc->cpu_idle < scp->cpu_idle) && (scp->cpu_idle < (ULLONG_MAX & 0x80000))) {
-               scp->cpu_idle = 0;
-       }
-       if ((scc->cpu_iowait < scp->cpu_iowait) && (scp->cpu_iowait < (ULLONG_MAX & 0x80000))) {
-               scp->cpu_iowait = 0;
-       }
-
-       /*
-        * Don't take cpu_guest and cpu_guest_nice into account
-        * because cpu_user and cpu_nice already include them.
-        */
-       return ((scc->cpu_user    + scc->cpu_nice   +
-                scc->cpu_sys     + scc->cpu_iowait +
-                scc->cpu_idle    + scc->cpu_steal  +
-                scc->cpu_hardirq + scc->cpu_softirq) -
-               (scp->cpu_user    + scp->cpu_nice   +
-                scp->cpu_sys     + scp->cpu_iowait +
-                scp->cpu_idle    + scp->cpu_steal  +
-                scp->cpu_hardirq + scp->cpu_softirq) +
-                ishift);
-}
-
 /*
  ***************************************************************************
  * Unhandled situation: Panic and exit. Should never happen.
@@ -805,39 +732,6 @@ int count_bits(void *ptr, int size)
        return nr;
 }
 
-/*
- ***************************************************************************
- * Compute "extended" device statistics (service time, etc.).
- *
- * IN:
- * @sdc                Structure with current device statistics.
- * @sdp                Structure with previous device statistics.
- * @itv                Interval of time in 1/100th of a second.
- *
- * OUT:
- * @xds                Structure with extended statistics.
- ***************************************************************************
-*/
-void compute_ext_disk_stats(struct stats_disk *sdc, struct stats_disk *sdp,
-                           unsigned long long itv, struct ext_disk_stats *xds)
-{
-       double tput
-               = ((double) (sdc->nr_ios - sdp->nr_ios)) * 100 / itv;
-
-       xds->util  = S_VALUE(sdp->tot_ticks, sdc->tot_ticks, itv);
-       xds->svctm = tput ? xds->util / tput : 0.0;
-       /*
-        * Kernel gives ticks already in milliseconds for all platforms
-        * => no need for further scaling.
-        */
-       xds->await = (sdc->nr_ios - sdp->nr_ios) ?
-               ((sdc->rd_ticks - sdp->rd_ticks) + (sdc->wr_ticks - sdp->wr_ticks)) /
-               ((double) (sdc->nr_ios - sdp->nr_ios)) : 0.0;
-       xds->arqsz = (sdc->nr_ios - sdp->nr_ios) ?
-               ((sdc->rd_sect - sdp->rd_sect) + (sdc->wr_sect - sdp->wr_sect)) /
-               ((double) (sdc->nr_ios - sdp->nr_ios)) : 0.0;
-}
-
 /*
  ***************************************************************************
  * Convert in-place input string to lowercase.

diff --git a/common.h b/common.h
index b7a78093e100c11b58070c59e87c44174982ffea..be1aa94e7c7fb340e9b9e7d05e98b4bc9e07c627 100644 (file)
--- a/common.h
+++ b/common.h
@@ -19,8 +19,6 @@
 #include <sys/sysmacros.h>
 #endif
 
-#include "rd_stats.h"
-
 /*
  ***************************************************************************
  * Various keywords and constants
@@ -233,9 +231,6 @@ struct ext_disk_stats {
  ***************************************************************************
  */
 
-void compute_ext_disk_stats
-       (struct stats_disk *, struct stats_disk *, unsigned long long,
-        struct ext_disk_stats *);
 int count_bits
        (void *, int);
 int count_csvalues
@@ -266,8 +261,6 @@ time_t get_localtime
        (struct tm *, int);
 time_t get_time
        (struct tm *, int);
-unsigned long long get_per_cpu_interval
-       (struct stats_cpu *, struct stats_cpu *);
 char *get_persistent_name_from_pretty
        (char *);
 char *get_persistent_type_dir

diff --git a/iostat.c b/iostat.c
index 929c2410c3530feb5c35d4432783944b82417303..fdddc76270f48ce4d0c5d4d89218fdad0f903b06 100644 (file)
--- a/iostat.c
+++ b/iostat.c
@@ -35,7 +35,6 @@
 
 #include "version.h"
 #include "iostat.h"
-#include "common.h"
 #include "ioconf.h"
 #include "rd_stats.h"
 #include "count.h"

diff --git a/json_stats.c b/json_stats.c
index 495e371bfc5cc2786399db52908b636a4d1697aa..7e6e5601e4589777d445cfd5309c55756b9f6e74 100644 (file)
--- a/json_stats.c
+++ b/json_stats.c
@@ -24,7 +24,6 @@
 #include <stdarg.h>
 
 #include "sa.h"
-#include "sadf.h"
 #include "ioconf.h"
 #include "json_stats.h"
 

diff --git a/rd_sensors.c b/rd_sensors.c
index 45269e365f01e309b35940bd3e9641fa1e71a082..90d132b5751054ffc585b8d5d59ca8a7ce6abce7 100644 (file)
--- a/rd_sensors.c
+++ b/rd_sensors.c
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "common.h"
+#include "rd_stats.h"
 #include "rd_sensors.h"
 
 #ifdef USE_NLS

diff --git a/rd_sensors.h b/rd_sensors.h
index a39094af84cd5d76263bc4f687828240b5485b51..7b281cc994dd188ccd36fbf953420759df5b8cb0 100644 (file)
--- a/rd_sensors.h
+++ b/rd_sensors.h
@@ -6,9 +6,6 @@
 #ifndef _RD_SENSORS_H
 #define _RD_SENSORS_H
 
-#include "common.h"
-#include "rd_stats.h"
-
 /*
  ***************************************************************************
  * Definitions of structures for sensors statistics

diff --git a/rd_stats.c b/rd_stats.c
index d26ceeeacb3ad6e4fd23dc9c318fa874f936a435..328091e9e1248533b1e9f9e4a35070f5b190b4a5 100644 (file)
--- a/rd_stats.c
+++ b/rd_stats.c
@@ -32,7 +32,6 @@
 
 #include "common.h"
 #include "rd_stats.h"
-#include "ioconf.h"
 
 #ifdef USE_NLS
 #include <locale.h>
@@ -354,6 +353,110 @@ void read_uptime(unsigned long long *uptime)
        }
 }
 
+/*
+ ***************************************************************************
+ * Compute "extended" device statistics (service time, etc.).
+ *
+ * IN:
+ * @sdc                Structure with current device statistics.
+ * @sdp                Structure with previous device statistics.
+ * @itv                Interval of time in 1/100th of a second.
+ *
+ * OUT:
+ * @xds                Structure with extended statistics.
+ ***************************************************************************
+*/
+void compute_ext_disk_stats(struct stats_disk *sdc, struct stats_disk *sdp,
+                           unsigned long long itv, struct ext_disk_stats *xds)
+{
+       double tput
+               = ((double) (sdc->nr_ios - sdp->nr_ios)) * 100 / itv;
+
+       xds->util  = S_VALUE(sdp->tot_ticks, sdc->tot_ticks, itv);
+       xds->svctm = tput ? xds->util / tput : 0.0;
+       /*
+        * Kernel gives ticks already in milliseconds for all platforms
+        * => no need for further scaling.
+        */
+       xds->await = (sdc->nr_ios - sdp->nr_ios) ?
+               ((sdc->rd_ticks - sdp->rd_ticks) + (sdc->wr_ticks - sdp->wr_ticks)) /
+               ((double) (sdc->nr_ios - sdp->nr_ios)) : 0.0;
+       xds->arqsz = (sdc->nr_ios - sdp->nr_ios) ?
+               ((sdc->rd_sect - sdp->rd_sect) + (sdc->wr_sect - sdp->wr_sect)) /
+               ((double) (sdc->nr_ios - sdp->nr_ios)) : 0.0;
+}
+
+/*
+ ***************************************************************************
+ * Since ticks may vary slightly from CPU to CPU, we'll want
+ * to recalculate itv based on this CPU's tick count, rather
+ * than that reported by the "cpu" line. Otherwise we
+ * occasionally end up with slightly skewed figures, with
+ * the skew being greater as the time interval grows shorter.
+ *
+ * IN:
+ * @scc        Current sample statistics for current CPU.
+ * @scp        Previous sample statistics for current CPU.
+ *
+ * RETURNS:
+ * Interval of time based on current CPU, expressed in jiffies.
+ ***************************************************************************
+ */
+unsigned long long get_per_cpu_interval(struct stats_cpu *scc,
+                                       struct stats_cpu *scp)
+{
+       unsigned long long ishift = 0LL;
+
+       if ((scc->cpu_user - scc->cpu_guest) < (scp->cpu_user - scp->cpu_guest)) {
+               /*
+                * Sometimes the nr of jiffies spent in guest mode given by the guest
+                * counter in /proc/stat is slightly higher than that included in
+                * the user counter. Update the interval value accordingly.
+                */
+               ishift += (scp->cpu_user - scp->cpu_guest) -
+                         (scc->cpu_user - scc->cpu_guest);
+       }
+       if ((scc->cpu_nice - scc->cpu_guest_nice) < (scp->cpu_nice - scp->cpu_guest_nice)) {
+               /*
+                * Idem for nr of jiffies spent in guest_nice mode.
+                */
+               ishift += (scp->cpu_nice - scp->cpu_guest_nice) -
+                         (scc->cpu_nice - scc->cpu_guest_nice);
+       }
+
+       /*
+        * Workaround for CPU coming back online: With recent kernels
+        * some fields (user, nice, system) restart from their previous value,
+        * whereas others (idle, iowait) restart from zero.
+        * For the latter we need to set their previous value to zero to
+        * avoid getting an interval value < 0.
+        * (I don't know how the other fields like hardirq, steal... behave).
+        * Don't assume the CPU has come back from offline state if previous
+        * value was greater than ULLONG_MAX & 0x80000 (the counter probably
+        * overflew).
+        */
+       if ((scc->cpu_idle < scp->cpu_idle) && (scp->cpu_idle < (ULLONG_MAX & 0x80000))) {
+               scp->cpu_idle = 0;
+       }
+       if ((scc->cpu_iowait < scp->cpu_iowait) && (scp->cpu_iowait < (ULLONG_MAX & 0x80000))) {
+               scp->cpu_iowait = 0;
+       }
+
+       /*
+        * Don't take cpu_guest and cpu_guest_nice into account
+        * because cpu_user and cpu_nice already include them.
+        */
+       return ((scc->cpu_user    + scc->cpu_nice   +
+                scc->cpu_sys     + scc->cpu_iowait +
+                scc->cpu_idle    + scc->cpu_steal  +
+                scc->cpu_hardirq + scc->cpu_softirq) -
+               (scp->cpu_user    + scp->cpu_nice   +
+                scp->cpu_sys     + scp->cpu_iowait +
+                scp->cpu_idle    + scp->cpu_steal  +
+                scp->cpu_hardirq + scp->cpu_softirq) +
+                ishift);
+}
+
 #ifdef SOURCE_SADC
 /*---------------- BEGIN: FUNCTIONS USED BY SADC ONLY ---------------------*/
 

diff --git a/rd_stats.h b/rd_stats.h
index f9ad9d4a2557f3340b19b350825f1588f336bd35..2869229367b9a35ebc9032f245836659c1d49c2e 100644 (file)
--- a/rd_stats.h
+++ b/rd_stats.h
@@ -695,8 +695,11 @@ struct stats_softnet {
  ***************************************************************************
  */
 
-void oct2chr
-       (char *);
+void compute_ext_disk_stats
+       (struct stats_disk *, struct stats_disk *, unsigned long long,
+        struct ext_disk_stats *);
+unsigned long long get_per_cpu_interval
+       (struct stats_cpu *, struct stats_cpu *);
 __nr_t read_stat_cpu
        (struct stats_cpu *, __nr_t);
 __nr_t read_stat_irq
@@ -705,6 +708,9 @@ __nr_t read_meminfo
        (struct stats_memory *);
 void read_uptime
        (unsigned long long *);
+#ifdef SOURCE_SADC
+void oct2chr
+       (char *);
 __nr_t read_stat_pcsw
        (struct stats_pcsw *);
 __nr_t read_loadavg
@@ -773,5 +779,6 @@ __nr_t read_fchost
        (struct stats_fchost *, __nr_t);
 __nr_t read_softnet
        (struct stats_softnet *, __nr_t);
+#endif /* SOURCE_SADC */
 
 #endif /* _RD_STATS_H */

diff --git a/sa_common.c b/sa_common.c
index b1d8627568e13163971b4e1caab7d34c7f347aa2..1fd0506b7d03152441385f194ebd546c39a11358 100644 (file)
--- a/sa_common.c
+++ b/sa_common.c
@@ -35,9 +35,7 @@
 
 #include "version.h"
 #include "sa.h"
-#include "common.h"
 #include "ioconf.h"
-#include "rd_stats.h"
 
 #ifdef USE_NLS
 #include <locale.h>

diff --git a/sa_conv.c b/sa_conv.c
index 2cfbf3fd6abd9e93bbdbadcb495a2f7fd1c38151..d6e398b685f6df9ba50811d15893e030e7c1c25e 100644 (file)
--- a/sa_conv.c
+++ b/sa_conv.c
@@ -27,7 +27,6 @@
 
 #include "version.h"
 #include "sadf.h"
-#include "sa.h"
 #include "sa_conv.h"
 
 #ifdef USE_NLS

diff --git a/sa_wrap.c b/sa_wrap.c
index fc2dfe20496de98270c2b0dc1563946c7ee4746e..5773836dc2162a4d72a6f74b8c0f3435918fed2e 100644 (file)
--- a/sa_wrap.c
+++ b/sa_wrap.c
@@ -23,9 +23,7 @@
 #include <string.h>
 
 #include "sa.h"
-#include "rd_stats.h"
 #include "count.h"
-#include "rd_sensors.h"
 
 extern unsigned int flags;
 extern struct record_header record_hdr;

diff --git a/sadc.c b/sadc.c
index b98f61be0699af7ed256c653d9cf8e3e56a31002..fd2f08b5238be97544c73022cf2d349b2f4f7ceb 100644 (file)
--- a/sadc.c
+++ b/sadc.c
@@ -35,9 +35,6 @@
 
 #include "version.h"
 #include "sa.h"
-#include "rd_stats.h"
-#include "common.h"
-#include "ioconf.h"
 
 #ifdef USE_NLS
 #include <locale.h>

diff --git a/sadf.c b/sadf.c
index 09beab2e92c2087097c8bd8109eb45fbe59b55ed..57d21bc0556a0f364ffb5f34960afd6dd0ae666f 100644 (file)
--- a/sadf.c
+++ b/sadf.c
@@ -29,9 +29,6 @@
 
 #include "version.h"
 #include "sadf.h"
-#include "sa.h"
-#include "common.h"
-#include "ioconf.h"
 
 # include <locale.h>   /* For setlocale() */
 #ifdef USE_NLS

diff --git a/sadf_misc.c b/sadf_misc.c
index 9d6b106ffd62e3dda058155ded5a02c3b5e9bf61..f2f418e5042977ea7505babeb0bd13f22a9501c9 100644 (file)
--- a/sadf_misc.c
+++ b/sadf_misc.c
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include "sadf.h"
-#include "sa.h"
 
 #ifdef USE_NLS
 #include <locale.h>

diff --git a/sar.c b/sar.c
index 36f7ce71790b12a9294737093db8e5b4142c05f2..269c38ae49093367ed07eadbaa91af939fe7c251 100644 (file)
--- a/sar.c
+++ b/sar.c
@@ -30,9 +30,6 @@
 
 #include "version.h"
 #include "sa.h"
-#include "common.h"
-#include "ioconf.h"
-#include "pr_stats.h"
 
 #ifdef USE_NLS
 #include <locale.h>

diff --git a/svg_stats.c b/svg_stats.c
index 9e6dcf5381f5680b87aefb94f58879e15b7ab5bc..e63c4d3cec5e3c5376a06849b6beba5aa2126831 100644 (file)
--- a/svg_stats.c
+++ b/svg_stats.c
@@ -26,7 +26,6 @@
 #include <float.h>
 
 #include "sa.h"
-#include "sadf.h"
 #include "ioconf.h"
 #include "svg_stats.h"
 

diff --git a/tapestat.c b/tapestat.c
index 13aa2dbf162bbcb628fa904e5f58677b94e75c14..a57beffadd676c868b0adfcb337968b13c6ab3a0 100644 (file)
--- a/tapestat.c
+++ b/tapestat.c
@@ -48,6 +48,7 @@
 #include "version.h"
 #include "tapestat.h"
 #include "common.h"
+#include "rd_stats.h"
 #include "count.h"
 
 #ifdef USE_NLS

diff --git a/xml_stats.c b/xml_stats.c
index 65611cf78de67d1e4e980863a4289fc02d2fdb41..3521dc42ec58a4cdf1ad89c79c4faefff47a69ff 100644 (file)
--- a/xml_stats.c
+++ b/xml_stats.c
@@ -24,7 +24,6 @@
 #include <stdarg.h>
 
 #include "sa.h"
-#include "sadf.h"
 #include "ioconf.h"
 #include "xml_stats.h"