From 2ce1db8202b1eba6da45b347c0c81a508f8c088a Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Sun, 24 Jul 2016 13:56:32 +0200 Subject: [PATCH] treewide: remove unused includes --- src/collectd-tg.c | 1 - src/daemon/collectd.c | 2 -- src/daemon/common.c | 2 -- src/daemon/meta_data.c | 2 -- src/daemon/utils_avltree.c | 4 ---- src/daemon/utils_cache.c | 1 - src/daemon/utils_cache.h | 2 +- src/daemon/utils_heap.c | 1 - src/grpc.cc | 1 - src/libcollectdclient/network_buffer.c | 1 - src/match_empty_counter.c | 1 - src/match_hashed.c | 1 - src/match_timediff.c | 1 - src/network.c | 1 - src/statsd.c | 1 - src/utils_fbhash.c | 2 -- src/utils_parse_option.c | 2 -- src/write_graphite.c | 1 - src/write_http.c | 1 - src/write_riemann_threshold.c | 4 ---- src/zone.c | 2 -- 21 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/collectd-tg.c b/src/collectd-tg.c index 23257fde..eaa99f63 100644 --- a/src/collectd-tg.c +++ b/src/collectd-tg.c @@ -46,7 +46,6 @@ #include "libcollectdclient/collectd/client.h" #include "libcollectdclient/collectd/network.h" -#include "libcollectdclient/collectd/network_buffer.h" #define DEF_NUM_HOSTS 1000 #define DEF_NUM_PLUGINS 20 diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c index ce4922d6..2fce643d 100644 --- a/src/daemon/collectd.c +++ b/src/daemon/collectd.c @@ -35,8 +35,6 @@ #include #include -#include - #if HAVE_LOCALE_H # include #endif diff --git a/src/daemon/common.c b/src/daemon/common.c index 4c271d34..f9b1433b 100644 --- a/src/daemon/common.c +++ b/src/daemon/common.c @@ -36,8 +36,6 @@ #include "plugin.h" #include "utils_cache.h" -#include - #ifdef HAVE_MATH_H # include #endif diff --git a/src/daemon/meta_data.c b/src/daemon/meta_data.c index b3f892a2..0cf8fdac 100644 --- a/src/daemon/meta_data.c +++ b/src/daemon/meta_data.c @@ -28,8 +28,6 @@ #include "plugin.h" #include "meta_data.h" -#include - /* * Data types */ diff --git a/src/daemon/utils_avltree.c b/src/daemon/utils_avltree.c index 1680c41f..e1c41ecf 100644 --- a/src/daemon/utils_avltree.c +++ b/src/daemon/utils_avltree.c @@ -24,11 +24,7 @@ * Florian octo Forster **/ -#include "config.h" - #include -#include -#include #include #include "utils_avltree.h" diff --git a/src/daemon/utils_cache.c b/src/daemon/utils_cache.c index bf8c901b..fa592f09 100644 --- a/src/daemon/utils_cache.c +++ b/src/daemon/utils_cache.c @@ -34,7 +34,6 @@ #include "meta_data.h" #include -#include typedef struct cache_entry_s { diff --git a/src/daemon/utils_cache.h b/src/daemon/utils_cache.h index 6c6a883c..93c25194 100644 --- a/src/daemon/utils_cache.h +++ b/src/daemon/utils_cache.h @@ -1,5 +1,5 @@ /** - * collectd - src/utils_cache.h + * collectd - utils_cache.h * Copyright (C) 2007 Florian octo Forster * Copyright (C) 2016 Sebastian tokkee Harl * diff --git a/src/daemon/utils_heap.c b/src/daemon/utils_heap.c index 19b1d5b9..86375811 100644 --- a/src/daemon/utils_heap.c +++ b/src/daemon/utils_heap.c @@ -25,7 +25,6 @@ **/ #include -#include #include #include #include diff --git a/src/grpc.cc b/src/grpc.cc index 7517bb72..a1dac35b 100644 --- a/src/grpc.cc +++ b/src/grpc.cc @@ -36,7 +36,6 @@ extern "C" { #include #include -#include #include "collectd.h" #include "common.h" diff --git a/src/libcollectdclient/network_buffer.c b/src/libcollectdclient/network_buffer.c index 130da235..2b97d189 100644 --- a/src/libcollectdclient/network_buffer.c +++ b/src/libcollectdclient/network_buffer.c @@ -36,7 +36,6 @@ #include #if HAVE_LIBGCRYPT -# include # if defined __APPLE__ /* default xcode compiler throws warnings even when deprecated functionality * is not used. -Werror breaks the build because of erroneous warnings. diff --git a/src/match_empty_counter.c b/src/match_empty_counter.c index 8f99a6d1..eba6a58e 100644 --- a/src/match_empty_counter.c +++ b/src/match_empty_counter.c @@ -26,7 +26,6 @@ #include "collectd.h" #include "common.h" -#include "utils_cache.h" #include "filter_chain.h" /* diff --git a/src/match_hashed.c b/src/match_hashed.c index 4178d757..79f79fac 100644 --- a/src/match_hashed.c +++ b/src/match_hashed.c @@ -26,7 +26,6 @@ #include "collectd.h" #include "common.h" -#include "utils_cache.h" #include "filter_chain.h" /* diff --git a/src/match_timediff.c b/src/match_timediff.c index 77c8f519..750817be 100644 --- a/src/match_timediff.c +++ b/src/match_timediff.c @@ -26,7 +26,6 @@ #include "collectd.h" #include "common.h" -#include "utils_cache.h" #include "filter_chain.h" #define SATISFY_ALL 0 diff --git a/src/network.c b/src/network.c index d3c60442..646f5b8f 100644 --- a/src/network.c +++ b/src/network.c @@ -30,7 +30,6 @@ #include "common.h" #include "configfile.h" #include "utils_fbhash.h" -#include "utils_avltree.h" #include "utils_cache.h" #include "utils_complain.h" diff --git a/src/statsd.c b/src/statsd.c index 1819b3ea..57cdbc55 100644 --- a/src/statsd.c +++ b/src/statsd.c @@ -29,7 +29,6 @@ #include "common.h" #include "configfile.h" #include "utils_avltree.h" -#include "utils_complain.h" #include "utils_latency.h" #include diff --git a/src/utils_fbhash.c b/src/utils_fbhash.c index f27c0827..41f640af 100644 --- a/src/utils_fbhash.c +++ b/src/utils_fbhash.c @@ -27,8 +27,6 @@ #include "collectd.h" #include "plugin.h" -#include - #include "utils_fbhash.h" #include "utils_avltree.h" diff --git a/src/utils_parse_option.c b/src/utils_parse_option.c index 69da0403..f3ec71ae 100644 --- a/src/utils_parse_option.c +++ b/src/utils_parse_option.c @@ -25,8 +25,6 @@ **/ #include "collectd.h" -#include "common.h" -#include "plugin.h" #include "utils_parse_option.h" int parse_string (char **ret_buffer, char **ret_string) diff --git a/src/write_graphite.c b/src/write_graphite.c index 0f9a8bea..64794bec 100644 --- a/src/write_graphite.c +++ b/src/write_graphite.c @@ -47,7 +47,6 @@ #include "plugin.h" #include "configfile.h" -#include "utils_cache.h" #include "utils_complain.h" #include "utils_format_graphite.h" diff --git a/src/write_http.c b/src/write_http.c index 779c94f6..aea79352 100644 --- a/src/write_http.c +++ b/src/write_http.c @@ -26,7 +26,6 @@ #include "collectd.h" #include "plugin.h" #include "common.h" -#include "utils_cache.h" #include "utils_format_json.h" #include diff --git a/src/write_riemann_threshold.c b/src/write_riemann_threshold.c index a09ae5fd..a4249ecf 100644 --- a/src/write_riemann_threshold.c +++ b/src/write_riemann_threshold.c @@ -33,10 +33,6 @@ #include "utils_threshold.h" #include "write_riemann_threshold.h" -#include -#include -#include - /* * Threshold management * ==================== diff --git a/src/zone.c b/src/zone.c index ba07c9ef..40c4d2ee 100644 --- a/src/zone.c +++ b/src/zone.c @@ -34,8 +34,6 @@ #include "common.h" #include "plugin.h" -#include -#include #include #include -- 2.30.2