library: rename 'diskstat' source as 'diskstats' files

Where possible, libprocps files convey the name of the
actual source pseudo file under the '/proc' directory.

This brings diskstats into line with such an approach.

Signed-off-by: Jim Warner <james.warner@comcast.net>

diff --git a/Makefile.am b/Makefile.am
index ba4fbac47d5c3379cc00451e66598b3dd854cb8c..ae072b7726d9fb3383c072933a3e84f47a230058 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,8 +177,8 @@ proc_libprocps_la_SOURCES = \
        proc/alloc.h \
        proc/devname.c \
        proc/devname.h \
-       proc/diskstat.c \
-       proc/diskstat.h \
+       proc/diskstats.c \
+       proc/diskstats.h \
        proc/escape.c \
        proc/escape.h \
        proc/procps-private.h \
@@ -212,7 +212,7 @@ proc_libprocps_la_includedir = $(includedir)/proc/
 proc_libprocps_la_include_HEADERS = \
        proc/alloc.h \
        proc/devname.h \
-       proc/diskstat.h \
+       proc/diskstats.h \
        proc/escape.h \
        proc/pids.h \
        proc/procps.h \

diff --git a/proc/diskstat.c b/proc/diskstats.c
similarity index 99%
rename from proc/diskstat.c
rename to proc/diskstats.c
index ebf4a921627478487a81bb68f5fbe53267a71e5a..cf8a117eea7d7f0f433564fa98309616cb4d1159 100644 (file)
--- a/proc/diskstat.c
+++ b/proc/diskstats.c
@@ -30,7 +30,7 @@
 #include <dirent.h>
 #include <errno.h>
 
-#include <proc/diskstat.h>
+#include <proc/diskstats.h>
 #include "procps-private.h"
 
 #define DISKSTAT_LINE_LEN 1024

diff --git a/proc/diskstat.h b/proc/diskstats.h
similarity index 98%
rename from proc/diskstat.h
rename to proc/diskstats.h
index 29dc8fce16eedc8abb8d528267dde678324e379a..40df3c072cbfb5e034ff3cab1c4445664a1fd1a5 100644 (file)
--- a/proc/diskstat.h
+++ b/proc/diskstats.h
@@ -22,7 +22,7 @@
 #ifndef PROC_DISKSTAT_H
 #define PROC_DISKSTAT_H
 
-#include <features.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 

diff --git a/proc/procps.h b/proc/procps.h
index e46e044544145c3aa330e69e3a1bb1f1cec42c15..53033e98a0c7d7524007115db1fb28fa4238d96c 100644 (file)
--- a/proc/procps.h
+++ b/proc/procps.h
@@ -19,7 +19,7 @@
 #define PROCPS_PROC_PROCPS_H
 
 /* includes that show public exports go here */
-#include <proc/diskstat.h>
+#include <proc/diskstats.h>
 #include <proc/meminfo.h>
 #include <proc/namespace.h>
 #include <proc/pids.h>