From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 10 Aug 2016 08:26:45 +0000 (+0200)
Subject: Remove configfile.h from plugins
X-Git-Tag: collectd-5.6.0~53^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dcf9ab7675fe91d1bd74998f55031bc3b0480c0;p=thirdparty%2Fcollectd.git

Remove configfile.h from plugins

It is already included by collectd.h
---

diff --git a/src/aggregation.c b/src/aggregation.c
index b9db500b1..2744c89ec 100644
--- a/src/aggregation.c
+++ b/src/aggregation.c
@@ -28,7 +28,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 #include "meta_data.h"
 #include "utils_cache.h" /* for uc_get_rate() */
 #include "utils_subst.h"
diff --git a/src/apache.c b/src/apache.c
index 650d67889..e10a15d46 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <curl/curl.h>
 
diff --git a/src/apcups.c b/src/apcups.c
index cc2035787..af5f24c70 100644
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -28,7 +28,6 @@
 
 #include "common.h"      /* rrd_update_file */
 #include "plugin.h"      /* plugin_register, plugin_submit */
-#include "configfile.h"  /* cf_register */
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
diff --git a/src/ascent.c b/src/ascent.c
index 20fef656c..11bb97f0c 100644
--- a/src/ascent.c
+++ b/src/ascent.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <curl/curl.h>
 #include <libxml/parser.h>
diff --git a/src/bind.c b/src/bind.c
index 7fda03496..9b6b32e3d 100644
--- a/src/bind.c
+++ b/src/bind.c
@@ -39,7 +39,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 /* Some versions of libcurl don't include this themselves and then don't have
  * fd_set available. */
diff --git a/src/cgroups.c b/src/cgroups.c
index 3a59ec4c0..f7c7e0d63 100644
--- a/src/cgroups.c
+++ b/src/cgroups.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_mount.h"
 #include "utils_ignorelist.h"
 
diff --git a/src/curl.c b/src/curl.c
index 8d7baa51a..74ef13c97 100644
--- a/src/curl.c
+++ b/src/curl.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_curl_stats.h"
 #include "utils_match.h"
 #include "utils_time.h"
diff --git a/src/curl_json.c b/src/curl_json.c
index d4e78039e..0c10899ae 100644
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_avltree.h"
 #include "utils_complain.h"
 #include "utils_curl_stats.h"
diff --git a/src/curl_xml.c b/src/curl_xml.c
index f3aa2d9af..1d9ecc0bf 100644
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@ -23,7 +23,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_curl_stats.h"
 #include "utils_llist.h"
 
diff --git a/src/dbi.c b/src/dbi.c
index b93aa51e3..783ea2b9e 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_db_query.h"
 
 #include <dbi/dbi.h>
diff --git a/src/df.c b/src/df.c
index 83be17646..4a86799c2 100644
--- a/src/df.c
+++ b/src/df.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_mount.h"
 #include "utils_ignorelist.h"
 
diff --git a/src/dns.c b/src/dns.c
index 15fa15a79..e23a2bb21 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include "utils_dns.h"
 #include <poll.h>
diff --git a/src/email.c b/src/email.c
index 9dce34c43..2662da9e3 100644
--- a/src/email.c
+++ b/src/email.c
@@ -43,8 +43,6 @@
 #include "common.h"
 #include "plugin.h"
 
-#include "configfile.h"
-
 #include <stddef.h>
 
 #include <sys/un.h>
diff --git a/src/ethstat.c b/src/ethstat.c
index a213b60a6..d0e77281e 100644
--- a/src/ethstat.c
+++ b/src/ethstat.c
@@ -26,7 +26,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_avltree.h"
 #include "utils_complain.h"
 
diff --git a/src/fhcount.c b/src/fhcount.c
index c7603c7dc..4b3abff72 100644
--- a/src/fhcount.c
+++ b/src/fhcount.c
@@ -21,7 +21,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 
 static const char *config_keys[] = {
diff --git a/src/gmond.c b/src/gmond.c
index 2b299ca0d..13ec63895 100644
--- a/src/gmond.c
+++ b/src/gmond.c
@@ -28,7 +28,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 #include "utils_avltree.h"
 
 #if HAVE_NETDB_H
diff --git a/src/gps.c b/src/gps.c
index 19f317cb0..f72cef496 100644
--- a/src/gps.c
+++ b/src/gps.c
@@ -30,7 +30,6 @@
 #include "common.h"
 #include "plugin.h"
 #include "utils_time.h"
-#include "configfile.h"
 
 #define CGPS_TRUE                  1
 #define CGPS_FALSE                 0
diff --git a/src/grpc.cc b/src/grpc.cc
index ae3dab25d..06f561573 100644
--- a/src/grpc.cc
+++ b/src/grpc.cc
@@ -39,7 +39,6 @@ extern "C" {
 
 #include "collectd.h"
 #include "common.h"
-#include "configfile.h"
 #include "plugin.h"
 
 #include "daemon/utils_cache.h"
diff --git a/src/hddtemp.c b/src/hddtemp.c
index 8213e9724..865ea8614 100644
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -33,7 +33,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 # include <netdb.h>
 # include <netinet/in.h>
diff --git a/src/interface.c b/src/interface.c
index a74699ee8..b8ed6e402 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -26,7 +26,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_ignorelist.h"
 
 #if HAVE_SYS_TYPES_H
diff --git a/src/ipc.c b/src/ipc.c
index 70c55dc1c..b164cdf72 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -30,7 +30,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #if KERNEL_LINUX
   /* _GNU_SOURCE is needed for struct shm_info.used_ids on musl libc */
diff --git a/src/iptables.c b/src/iptables.c
index e035a8881..11849f210 100644
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.h>
diff --git a/src/irq.c b/src/irq.c
index 0c363795c..0f1d3f0ce 100644
--- a/src/irq.c
+++ b/src/irq.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_ignorelist.h"
 
 #if !KERNEL_LINUX
diff --git a/src/madwifi.c b/src/madwifi.c
index 728fcd8cc..053bd7fa2 100644
--- a/src/madwifi.c
+++ b/src/madwifi.c
@@ -92,7 +92,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_ignorelist.h"
 
 #include <dirent.h>
diff --git a/src/mbmon.c b/src/mbmon.c
index 184bb9942..9629b8960 100644
--- a/src/mbmon.c
+++ b/src/mbmon.c
@@ -27,7 +27,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/src/memcachec.c b/src/memcachec.c
index 1b6ab673d..dff554617 100644
--- a/src/memcachec.c
+++ b/src/memcachec.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_match.h"
 
 #include <libmemcached/memcached.h>
diff --git a/src/memcached.c b/src/memcached.c
index 42882ae50..c55236064 100644
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -32,7 +32,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <netdb.h>
 #include <sys/un.h>
diff --git a/src/modbus.c b/src/modbus.c
index db7d033d3..93fd54a51 100644
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -24,7 +24,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <netdb.h>
 
diff --git a/src/mysql.c b/src/mysql.c
index 6ba30057d..9167c6b55 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -31,7 +31,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #ifdef HAVE_MYSQL_H
 #include <mysql.h>
diff --git a/src/network.c b/src/network.c
index 1458a0ae8..51c075735 100644
--- a/src/network.c
+++ b/src/network.c
@@ -29,7 +29,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 #include "utils_fbhash.h"
 #include "utils_cache.h"
 #include "utils_complain.h"
diff --git a/src/nginx.c b/src/nginx.c
index e346cee30..16ce3d5f6 100644
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -30,7 +30,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <curl/curl.h>
 
diff --git a/src/notify_desktop.c b/src/notify_desktop.c
index ef7b95b87..5cab1190d 100644
--- a/src/notify_desktop.c
+++ b/src/notify_desktop.c
@@ -32,7 +32,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <glib.h>
 #include <libnotify/notify.h>
diff --git a/src/notify_nagios.c b/src/notify_nagios.c
index 57a034da8..b08c411df 100644
--- a/src/notify_nagios.c
+++ b/src/notify_nagios.c
@@ -28,7 +28,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 
 #define NAGIOS_OK       0
 #define NAGIOS_WARNING  1
diff --git a/src/ntpd.c b/src/ntpd.c
index a0093655e..30f29c97d 100644
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -31,7 +31,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #if HAVE_STDINT_H
 # include <stdint.h>
diff --git a/src/openldap.c b/src/openldap.c
index 282e2dc7d..135353615 100644
--- a/src/openldap.c
+++ b/src/openldap.c
@@ -30,7 +30,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #if defined(__APPLE__)
 #pragma clang diagnostic push
diff --git a/src/oracle.c b/src/oracle.c
index 155483009..c0f2fa412 100644
--- a/src/oracle.c
+++ b/src/oracle.c
@@ -49,7 +49,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_db_query.h"
 
 #include <oci.h>
diff --git a/src/perl.c b/src/perl.c
index 48374b69b..9eef6c1ad 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -37,8 +37,6 @@
 
 #undef DONT_POISON_SPRINTF_YET
 
-#include "configfile.h"
-
 #if HAVE_STDBOOL_H
 # include <stdbool.h>
 #endif
diff --git a/src/pinba.c b/src/pinba.c
index b9eed68eb..8a0902aa9 100644
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -27,7 +27,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <netdb.h>
 #include <poll.h>
diff --git a/src/ping.c b/src/ping.c
index 4932bae57..59ddbc961 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_complain.h"
 
 #include <netinet/in.h>
diff --git a/src/postgresql.c b/src/postgresql.c
index 7e69877c4..c4e19db65 100644
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -34,7 +34,6 @@
 
 #include "common.h"
 
-#include "configfile.h"
 #include "plugin.h"
 
 #include "utils_cache.h"
diff --git a/src/powerdns.c b/src/powerdns.c
index e215a8c3e..f907d006e 100644
--- a/src/powerdns.c
+++ b/src/powerdns.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_llist.h"
 
 #include <sys/stat.h>
diff --git a/src/processes.c b/src/processes.c
index d34fe40f3..ea219c11f 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -38,7 +38,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 /* Include header files for the mach system, if they exist.. */
 #if HAVE_THREAD_INFO
diff --git a/src/redis.c b/src/redis.c
index 7395ba068..5214eccc1 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -24,7 +24,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <sys/time.h>
 #include <hiredis/hiredis.h>
diff --git a/src/sensors.c b/src/sensors.c
index de2a4f7b9..4f3d0d603 100644
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -37,7 +37,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_ignorelist.h"
 
 #if defined(HAVE_SENSORS_SENSORS_H)
diff --git a/src/statsd.c b/src/statsd.c
index 040181aab..9c138f978 100644
--- a/src/statsd.c
+++ b/src/statsd.c
@@ -28,7 +28,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 #include "utils_avltree.h"
 #include "utils_latency.h"
 
diff --git a/src/table.c b/src/table.c
index ba65f41c3..81e946145 100644
--- a/src/table.c
+++ b/src/table.c
@@ -32,7 +32,6 @@
 
 #include "common.h"
 
-#include "configfile.h"
 #include "plugin.h"
 
 #define log_err(...) ERROR ("table plugin: " __VA_ARGS__)
diff --git a/src/ted.c b/src/ted.c
index 96c94e5d3..5ed6c278d 100644
--- a/src/ted.c
+++ b/src/ted.c
@@ -38,7 +38,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #if HAVE_TERMIOS_H && HAVE_SYS_IOCTL_H && HAVE_MATH_H
 # include <termios.h>
diff --git a/src/thermal.c b/src/thermal.c
index c6db8c046..e001a62ac 100644
--- a/src/thermal.c
+++ b/src/thermal.c
@@ -23,7 +23,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_ignorelist.h"
 
 #if !KERNEL_LINUX
diff --git a/src/unixsock.c b/src/unixsock.c
index 1faeff9c5..808ba98ba 100644
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include "utils_cmd_flush.h"
 #include "utils_cmd_getval.h"
diff --git a/src/utils_curl_stats.h b/src/utils_curl_stats.h
index f708c6296..b6d0bb4db 100644
--- a/src/utils_curl_stats.h
+++ b/src/utils_curl_stats.h
@@ -27,7 +27,6 @@
 #ifndef UTILS_CURL_STATS_H
 #define UTILS_CURL_STATS_H 1
 
-#include "configfile.h"
 #include "plugin.h"
 
 #include <curl/curl.h>
diff --git a/src/utils_db_query.c b/src/utils_db_query.c
index c8019845d..8a8bb10b4 100644
--- a/src/utils_db_query.c
+++ b/src/utils_db_query.c
@@ -28,7 +28,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_db_query.h"
 
 /*
diff --git a/src/utils_db_query.h b/src/utils_db_query.h
index 8586adb27..fe06de9e6 100644
--- a/src/utils_db_query.h
+++ b/src/utils_db_query.h
@@ -27,8 +27,6 @@
 #ifndef UTILS_DB_QUERY_H
 #define UTILS_DB_QUERY_H 1
 
-#include "configfile.h"
-
 /*
  * Data types
  */
diff --git a/src/uuid.c b/src/uuid.c
index 897662687..8bae37610 100644
--- a/src/uuid.c
+++ b/src/uuid.c
@@ -27,7 +27,6 @@
 #include "collectd.h"
 
 #include "common.h"
-#include "configfile.h"
 #include "plugin.h"
 
 #if HAVE_SYS_SYSCTL_H
diff --git a/src/varnish.c b/src/varnish.c
index bc6d294a9..e65b2a372 100644
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -27,7 +27,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #if HAVE_VARNISH_V4
 #include <vapi/vsm.h>
diff --git a/src/virt.c b/src/virt.c
index 7df51c130..c1c77bcf1 100644
--- a/src/virt.c
+++ b/src/virt.c
@@ -23,7 +23,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_ignorelist.h"
 #include "utils_complain.h"
 
diff --git a/src/write_graphite.c b/src/write_graphite.c
index 77003f1cd..8f38e0614 100644
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -46,7 +46,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include "utils_complain.h"
 #include "utils_format_graphite.h"
diff --git a/src/write_kafka.c b/src/write_kafka.c
index 6364c6c32..81ca128f3 100644
--- a/src/write_kafka.c
+++ b/src/write_kafka.c
@@ -28,7 +28,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 #include "utils_cmd_putval.h"
 #include "utils_format_graphite.h"
 #include "utils_format_json.h"
diff --git a/src/write_log.c b/src/write_log.c
index 3c599784b..7260615e3 100644
--- a/src/write_log.c
+++ b/src/write_log.c
@@ -29,7 +29,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include "utils_format_graphite.h"
 
diff --git a/src/write_mongodb.c b/src/write_mongodb.c
index 8fb13c348..01ce64ac7 100644
--- a/src/write_mongodb.c
+++ b/src/write_mongodb.c
@@ -32,7 +32,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 #include "utils_cache.h"
 
 #if HAVE_STDINT_H
diff --git a/src/write_redis.c b/src/write_redis.c
index 135a45878..973b1801b 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -28,7 +28,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 
 #include <sys/time.h>
 #include <hiredis/hiredis.h>
diff --git a/src/write_riemann.c b/src/write_riemann.c
index f14372343..0ed026032 100644
--- a/src/write_riemann.c
+++ b/src/write_riemann.c
@@ -31,7 +31,6 @@
 #include "collectd.h"
 
 #include "common.h"
-#include "configfile.h"
 #include "plugin.h"
 #include "utils_cache.h"
 #include "utils_complain.h"
diff --git a/src/write_sensu.c b/src/write_sensu.c
index 77069c08a..1f46242dd 100644
--- a/src/write_sensu.c
+++ b/src/write_sensu.c
@@ -30,7 +30,6 @@
 
 #include "plugin.h"
 #include "common.h"
-#include "configfile.h"
 #include "utils_cache.h"
 #include <arpa/inet.h>
 #include <errno.h>
diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index bf49ba5f2..c183d2784 100644
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
@@ -45,7 +45,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include "utils_cache.h"