sar/sadc: Make use of __nr_t type

__nr_t type (which defaults to int) is used to define a number of items
(devices, network interfaces, etc.) So use it instead of int in various
places.

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

diff --git a/count.c b/count.c
index c0a1d8fa749735670e537684e7451712738fd87d..9748e985f20137c20979456b3ad94e57ef98a470 100644 (file)
--- a/count.c
+++ b/count.c
@@ -156,9 +156,9 @@ int get_proc_cpu_nr(void)
  * 2: two proc...
  ***************************************************************************
  */
-int get_cpu_nr(unsigned int max_nr_cpus, int highest)
+__nr_t get_cpu_nr(unsigned int max_nr_cpus, int highest)
 {
-       int cpu_nr;
+       __nr_t cpu_nr;
 
        if ((cpu_nr = get_sys_cpu_nr(highest)) == 0) {
                /* /sys may be not mounted. Use /proc/stat instead */
@@ -188,11 +188,11 @@ int get_cpu_nr(unsigned int max_nr_cpus, int highest)
  * Number of interrupts per processor.
  ***************************************************************************
  */
-int get_irqcpu_nr(char *file, int max_nr_irqcpu, int cpu_nr)
+__nr_t get_irqcpu_nr(char *file, int max_nr_irqcpu, int cpu_nr)
 {
        FILE *fp;
        char *line = NULL;
-       unsigned int irq = 0;
+       __nr_t irq = 0;
        int p;
 
        if ((fp = fopen(file, "r")) == NULL)
@@ -229,12 +229,13 @@ int get_irqcpu_nr(char *file, int max_nr_irqcpu, int cpu_nr)
  * Number of devices (and partitions).
  ***************************************************************************
  */
-int get_diskstats_dev_nr(int count_part, int only_used_dev)
+__nr_t get_diskstats_dev_nr(int count_part, int only_used_dev)
 {
        FILE *fp;
        char line[256];
        char dev_name[MAX_NAME_LEN];
-       int dev = 0, i;
+       __nr_t dev = 0;
+       int i;
        unsigned long rd_ios, wr_ios;
 
        if ((fp = fopen(DISKSTATS, "r")) == NULL)
@@ -275,11 +276,11 @@ int get_diskstats_dev_nr(int count_part, int only_used_dev)
  * Number of interrupts, including total number of interrupts.
  ***************************************************************************
  */
-int get_irq_nr(void)
+__nr_t get_irq_nr(void)
 {
        FILE *fp;
        char line[8192];
-       int in = 0;
+       __nr_t in = 0;
        int pos = 4;
 
        if ((fp = fopen(STAT, "r")) == NULL)
@@ -310,11 +311,11 @@ int get_irq_nr(void)
  * Number of serial lines supporting tx/rx accouting.
  ***************************************************************************
  */
-int get_serial_nr(void)
+__nr_t get_serial_nr(void)
 {
        FILE *fp;
        char line[256];
-       int sl = 0;
+       __nr_t sl = 0;
 
        if ((fp = fopen(SERIAL, "r")) == NULL)
                return 0;       /* No SERIAL file */
@@ -343,11 +344,11 @@ int get_serial_nr(void)
  * Number of network interfaces.
  ***************************************************************************
  */
-int get_iface_nr(void)
+__nr_t get_iface_nr(void)
 {
        FILE *fp;
        char line[128];
-       int iface = 0;
+       __nr_t iface = 0;
 
        if ((fp = fopen(NET_DEV, "r")) == NULL)
                return 0;       /* No network device file */
@@ -375,9 +376,9 @@ int get_iface_nr(void)
  * Number of devices.
  ***************************************************************************
  */
-int get_disk_nr(unsigned int f)
+__nr_t get_disk_nr(unsigned int f)
 {
-       int disk_nr;
+       __nr_t disk_nr;
 
        /*
         * Partitions are taken into account by sar -d only with
@@ -396,12 +397,12 @@ int get_disk_nr(unsigned int f)
  * Number of frequencies.
  ***************************************************************************
  */
-int get_freq_nr(void)
+__nr_t get_freq_nr(void)
 {
        FILE *fp;
        char filename[MAX_PF_NAME];
        char line[128];
-       int freq = 0;
+       __nr_t freq = 0;
 
        snprintf(filename, MAX_PF_NAME, "%s/cpu0/%s",
                 SYSFS_DEVCPU, SYSFS_TIME_IN_STATE);
@@ -427,11 +428,11 @@ int get_freq_nr(void)
  * Return -1 if directory doesn't exist in sysfs.
  ***************************************************************************
  */
-int get_usb_nr(void)
+__nr_t get_usb_nr(void)
 {
        DIR *dir;
        struct dirent *drd;
-       int usb = 0;
+       __nr_t usb = 0;
 
        /* Open relevant /sys directory */
        if ((dir = opendir(SYSFS_USBDEV)) == NULL)
@@ -459,12 +460,13 @@ int get_usb_nr(void)
  * Number of filesystems.
  ***************************************************************************
  */
-int get_filesystem_nr(void)
+__nr_t get_filesystem_nr(void)
 {
        FILE *fp;
        char line[512], fs_name[MAX_FS_LEN], mountp[256];
-       int fs = 0, skip = 0, skip_next = 0;
        char *pos = 0;
+       __nr_t fs = 0;
+       int skip = 0, skip_next = 0;
        struct statvfs buf;
 
        if ((fp = fopen(MTAB, "r")) == NULL)
@@ -520,11 +522,11 @@ int get_filesystem_nr(void)
  * Return -1 if directory doesn't exist in sysfs.
  ***************************************************************************
  */
-int get_fchost_nr(void)
+__nr_t get_fchost_nr(void)
 {
        DIR *dir;
        struct dirent *drd;
-       int fc = 0;
+       __nr_t fc = 0;
 
        if ((dir = opendir(SYSFS_FCHOST)) == NULL) {
                /* Directory non-existent */

diff --git a/count.h b/count.h
index b70c85d9ce9004ea0a927055fb57ceee13581785..d68da3cf53dd7f8eb17261c51652e3fecf8c7a9a 100644 (file)
--- a/count.h
+++ b/count.h
@@ -15,27 +15,27 @@
  ***************************************************************************
  */
 
-int get_cpu_nr
+__nr_t get_cpu_nr
        (unsigned int, int);
-int get_irqcpu_nr
+__nr_t get_irqcpu_nr
        (char *, int, int);
-int get_diskstats_dev_nr
+__nr_t get_diskstats_dev_nr
        (int, int);
-int get_irq_nr
+__nr_t get_irq_nr
        (void);
-int get_serial_nr
+__nr_t get_serial_nr
        (void);
-int get_iface_nr
+__nr_t get_iface_nr
        (void);
-int get_disk_nr
+__nr_t get_disk_nr
        (unsigned int);
-int get_freq_nr
+__nr_t get_freq_nr
        (void);
-int get_usb_nr
+__nr_t get_usb_nr
        (void);
-int get_filesystem_nr
+__nr_t get_filesystem_nr
        (void);
-int get_fchost_nr
+__nr_t get_fchost_nr
        (void);
 
 #endif /* _COUNT_H */

diff --git a/rd_sensors.c b/rd_sensors.c
index e958568a0990914f3300e581d318f7c0b42a4123..9395cc73141e4ae689a744202b560b235707a4ee 100644 (file)
--- a/rd_sensors.c
+++ b/rd_sensors.c
@@ -218,8 +218,8 @@ void read_in(struct stats_pwr_in *st_pwr_in, int nbr)
  * Number of sensors.
  ***************************************************************************
  */
-int get_sensors_nr(sensors_feature_type type) {
-       int count = 0;
+__nr_t get_sensors_nr(sensors_feature_type type) {
+       __nr_t count = 0;
        const sensors_chip_name *chip;
        const sensors_feature *feature;
        int chip_nr = 0;
@@ -246,7 +246,7 @@ int get_sensors_nr(sensors_feature_type type) {
  * Number of fans.
  ***************************************************************************
  */
-int get_fan_nr(void)
+__nr_t get_fan_nr(void)
 {
 #ifdef HAVE_SENSORS
        return get_sensors_nr(SENSORS_FEATURE_FAN);
@@ -263,7 +263,7 @@ int get_fan_nr(void)
  * Number of temperature sensors.
  ***************************************************************************
  */
-int get_temp_nr(void)
+__nr_t get_temp_nr(void)
 {
 #ifdef HAVE_SENSORS
        return get_sensors_nr(SENSORS_FEATURE_TEMP);
@@ -281,7 +281,7 @@ int get_temp_nr(void)
  * Number of voltage inputs.
  ***************************************************************************
  */
-int get_in_nr(void)
+__nr_t get_in_nr(void)
 {
 #ifdef HAVE_SENSORS
        return get_sensors_nr(SENSORS_FEATURE_IN);

diff --git a/rd_sensors.h b/rd_sensors.h
index f9d470acf76d702c8de1be70c697299cb8bb2471..51d058aaf5e24c1cb875fea447952569574319ff 100644 (file)
--- a/rd_sensors.h
+++ b/rd_sensors.h
@@ -68,11 +68,11 @@ void read_in
  ***************************************************************************
  */
 
-int get_fan_nr
+__nr_t get_fan_nr
        (void);
-int get_temp_nr
+__nr_t get_temp_nr
        (void);
-int get_in_nr
+__nr_t get_in_nr
        (void);
 
 #endif /* _RD_SENSORS_H */

diff --git a/rd_stats.h b/rd_stats.h
index fc6be2effd8bcd2e1aaffd96a2b620c184f98fc3..8a8eeb875fc7186d3f5e4ca82f004ce3815c72b2 100644 (file)
--- a/rd_stats.h
+++ b/rd_stats.h
@@ -40,6 +40,9 @@
 #define C_DUPLEX_HALF  1
 #define C_DUPLEX_FULL  2
 
+/* Type for all functions counting items. Value can be negative (-1) */
+#define __nr_t         int
+
 /*
  ***************************************************************************
  * System files containing statistics

diff --git a/sa.h b/sa.h
index e6fa9ebe781142589a1a8adf615949e0eae44735..88315ce646aa0c1a85ff3483c3f869ccc22e17a0 100644 (file)
--- a/sa.h
+++ b/sa.h
@@ -291,8 +291,6 @@
 #define COUNT_ACTIVITIES       0
 #define COUNT_OUTPUTS          1
 
-/* Type for all functions counting items */
-#define __nr_t         int
 /* Type for all functions reading statistics */
 #define __read_funct_t void
 /* Type for all functions displaying statistics */