From 2eec67acbb00593e414549a7e5b35eb7dd776b1b Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Sat, 14 Feb 2015 09:44:31 +0100 Subject: remove unused includes This patch removes includes that are not used. The removals were found with include-what-you-use which checks if any of the symbols from a header is in use. --- src/resolve/resolved-dns-cache.h | 1 - src/resolve/resolved-dns-domain.h | 1 - src/resolve/resolved-dns-packet.h | 1 - src/resolve/resolved-dns-query.c | 2 -- src/resolve/resolved-dns-query.h | 6 ------ src/resolve/resolved-dns-rr.h | 2 -- src/resolve/resolved-dns-scope.h | 3 --- src/resolve/resolved-dns-server.h | 1 - src/resolve/resolved-dns-stream.h | 1 - src/resolve/resolved-dns-transaction.h | 2 -- src/resolve/resolved-link.h | 2 -- src/resolve/resolved-manager.c | 5 ----- src/resolve/resolved-manager.h | 4 ---- src/resolve/resolved.c | 1 - src/resolve/test-dns-domain.c | 1 - 15 files changed, 33 deletions(-) (limited to 'src/resolve') diff --git a/src/resolve/resolved-dns-cache.h b/src/resolve/resolved-dns-cache.h index e92280c319..8a9b3d459d 100644 --- a/src/resolve/resolved-dns-cache.h +++ b/src/resolve/resolved-dns-cache.h @@ -21,7 +21,6 @@ along with systemd; If not, see . ***/ -#include #include "hashmap.h" #include "prioq.h" diff --git a/src/resolve/resolved-dns-domain.h b/src/resolve/resolved-dns-domain.h index 36f27ea031..516d244f7a 100644 --- a/src/resolve/resolved-dns-domain.h +++ b/src/resolve/resolved-dns-domain.h @@ -21,7 +21,6 @@ #pragma once -#include #include "hashmap.h" #include "in-addr-util.h" diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h index 561dd3adfa..c5867386c6 100644 --- a/src/resolve/resolved-dns-packet.h +++ b/src/resolve/resolved-dns-packet.h @@ -21,7 +21,6 @@ along with systemd; If not, see . ***/ -#include #include "macro.h" #include "sparse-endian.h" diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index f0483c9806..d619fae725 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -19,10 +19,8 @@ along with systemd; If not, see . ***/ -#include "af-list.h" #include "resolved-dns-query.h" -#include "resolved-dns-domain.h" /* How long to wait for the query in total */ #define QUERY_TIMEOUT_USEC (30 * USEC_PER_SEC) diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h index 13b3ee4f81..788992e679 100644 --- a/src/resolve/resolved-dns-query.h +++ b/src/resolve/resolved-dns-query.h @@ -21,21 +21,15 @@ along with systemd; If not, see . ***/ -#include #include "sd-bus.h" -#include "util.h" #include "set.h" typedef struct DnsQuery DnsQuery; -#include "resolved-dns-scope.h" -#include "resolved-dns-rr.h" #include "resolved-dns-question.h" #include "resolved-dns-answer.h" #include "resolved-dns-stream.h" -#include "resolved-dns-transaction.h" -#include "resolved-manager.h" struct DnsQuery { Manager *manager; diff --git a/src/resolve/resolved-dns-rr.h b/src/resolve/resolved-dns-rr.h index 9d9a89d383..26796c842b 100644 --- a/src/resolve/resolved-dns-rr.h +++ b/src/resolve/resolved-dns-rr.h @@ -21,10 +21,8 @@ along with systemd; If not, see . ***/ -#include #include -#include "util.h" #include "hashmap.h" #include "in-addr-util.h" #include "dns-type.h" diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h index f05648e5a5..cfbde1343f 100644 --- a/src/resolve/resolved-dns-scope.h +++ b/src/resolve/resolved-dns-scope.h @@ -27,11 +27,8 @@ typedef struct DnsScope DnsScope; #include "resolved-dns-server.h" #include "resolved-dns-packet.h" -#include "resolved-dns-query.h" #include "resolved-dns-cache.h" #include "resolved-dns-zone.h" -#include "resolved-dns-stream.h" -#include "resolved-manager.h" #include "resolved-link.h" typedef enum DnsScopeMatch { diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h index a438a27763..70ff35b08f 100644 --- a/src/resolve/resolved-dns-server.h +++ b/src/resolve/resolved-dns-server.h @@ -32,7 +32,6 @@ typedef enum DnsServerType { DNS_SERVER_LINK, } DnsServerType; -#include "resolved-manager.h" #include "resolved-link.h" struct DnsServer { diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h index 46eae31c60..fb81e9f1ac 100644 --- a/src/resolve/resolved-dns-stream.h +++ b/src/resolve/resolved-dns-stream.h @@ -27,7 +27,6 @@ typedef struct DnsStream DnsStream; #include "resolved-dns-packet.h" #include "resolved-dns-transaction.h" -#include "resolved-manager.h" struct DnsStream { Manager *manager; diff --git a/src/resolve/resolved-dns-transaction.h b/src/resolve/resolved-dns-transaction.h index 182fb7714c..f6d539d315 100644 --- a/src/resolve/resolved-dns-transaction.h +++ b/src/resolve/resolved-dns-transaction.h @@ -40,11 +40,9 @@ enum DnsTransactionState { }; #include "resolved-dns-scope.h" -#include "resolved-dns-rr.h" #include "resolved-dns-packet.h" #include "resolved-dns-question.h" #include "resolved-dns-answer.h" -#include "resolved-dns-stream.h" struct DnsTransaction { DnsScope *scope; diff --git a/src/resolve/resolved-link.h b/src/resolve/resolved-link.h index 4f0702e872..eee1846108 100644 --- a/src/resolve/resolved-link.h +++ b/src/resolve/resolved-link.h @@ -29,8 +29,6 @@ typedef struct Link Link; typedef struct LinkAddress LinkAddress; -#include "resolved-dns-server.h" -#include "resolved-dns-scope.h" #include "resolved-dns-rr.h" #include "resolved-manager.h" diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index b5ad701611..167bea39b3 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -19,18 +19,13 @@ along with systemd; If not, see . ***/ -#include #include -#include #include #include #include #include "rtnl-util.h" -#include "event-util.h" -#include "network-util.h" #include "network-internal.h" -#include "conf-parser.h" #include "socket-util.h" #include "af-list.h" #include "utf8.h" diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h index 1151029d29..5a581cc13a 100644 --- a/src/resolve/resolved-manager.h +++ b/src/resolve/resolved-manager.h @@ -24,9 +24,7 @@ #include "sd-event.h" #include "sd-network.h" #include "sd-rtnl.h" -#include "util.h" #include "list.h" -#include "in-addr-util.h" #include "hashmap.h" typedef struct Manager Manager; @@ -41,8 +39,6 @@ enum Support { }; #include "resolved-dns-query.h" -#include "resolved-dns-server.h" -#include "resolved-dns-scope.h" #include "resolved-dns-stream.h" #include "resolved-link.h" diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c index ce15a8011d..271247ca3f 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -22,7 +22,6 @@ #include "sd-event.h" #include "sd-daemon.h" #include "mkdir.h" -#include "label.h" #include "capability.h" #include "selinux-util.h" diff --git a/src/resolve/test-dns-domain.c b/src/resolve/test-dns-domain.c index ebc8d98fce..2f3edaf783 100644 --- a/src/resolve/test-dns-domain.c +++ b/src/resolve/test-dns-domain.c @@ -19,7 +19,6 @@ along with systemd; If not, see . ***/ -#include "log.h" #include "macro.h" #include "resolved-dns-domain.h" -- cgit v1.2.3-54-g00ecf