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/libsystemd/sd-bus/bus-bloom.h | 1 - src/libsystemd/sd-bus/bus-common-errors.h | 1 - src/libsystemd/sd-bus/bus-container.c | 1 - src/libsystemd/sd-bus/bus-control.c | 1 - src/libsystemd/sd-bus/bus-creds.c | 1 - src/libsystemd/sd-bus/bus-creds.h | 1 - src/libsystemd/sd-bus/bus-dump.c | 1 - src/libsystemd/sd-bus/bus-gvariant.c | 1 - src/libsystemd/sd-bus/bus-internal.h | 2 -- src/libsystemd/sd-bus/bus-introspect.c | 1 - src/libsystemd/sd-bus/bus-introspect.h | 1 - src/libsystemd/sd-bus/bus-kernel.c | 1 - src/libsystemd/sd-bus/bus-match.c | 1 - src/libsystemd/sd-bus/bus-message.c | 1 - src/libsystemd/sd-bus/bus-message.h | 2 -- src/libsystemd/sd-bus/bus-signature.h | 1 - src/libsystemd/sd-bus/bus-socket.c | 3 --- src/libsystemd/sd-bus/bus-track.c | 1 - src/libsystemd/sd-bus/bus-type.c | 1 - src/libsystemd/sd-bus/bus-type.h | 1 - src/libsystemd/sd-bus/bus-util.h | 1 - src/libsystemd/sd-bus/busctl-introspect.h | 1 - src/libsystemd/sd-bus/busctl.c | 2 -- src/libsystemd/sd-bus/sd-bus.c | 5 ----- src/libsystemd/sd-bus/test-bus-chat.c | 1 - src/libsystemd/sd-bus/test-bus-creds.c | 1 - src/libsystemd/sd-bus/test-bus-introspect.c | 1 - src/libsystemd/sd-bus/test-bus-kernel-benchmark.c | 4 ---- src/libsystemd/sd-bus/test-bus-kernel-bloom.c | 2 -- src/libsystemd/sd-bus/test-bus-kernel.c | 2 -- src/libsystemd/sd-bus/test-bus-marshal.c | 2 -- src/libsystemd/sd-bus/test-bus-match.c | 1 - src/libsystemd/sd-bus/test-bus-objects.c | 3 --- src/libsystemd/sd-bus/test-bus-server.c | 4 ---- src/libsystemd/sd-bus/test-bus-signature.c | 2 -- src/libsystemd/sd-bus/test-bus-zero-copy.c | 2 -- 36 files changed, 58 deletions(-) (limited to 'src/libsystemd/sd-bus') diff --git a/src/libsystemd/sd-bus/bus-bloom.h b/src/libsystemd/sd-bus/bus-bloom.h index 96c82d7e8f..a9350d7f51 100644 --- a/src/libsystemd/sd-bus/bus-bloom.h +++ b/src/libsystemd/sd-bus/bus-bloom.h @@ -23,7 +23,6 @@ #include #include -#include /* * Our default bloom filter has the following parameters: diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h index e935833bc3..b17b62ac93 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.h +++ b/src/libsystemd/sd-bus/bus-common-errors.h @@ -21,7 +21,6 @@ along with systemd; If not, see . ***/ -#include "sd-bus.h" #include "bus-error.h" #define BUS_ERROR_NO_SUCH_UNIT "org.freedesktop.systemd1.NoSuchUnit" diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c index d29b98a269..3b3a5d357f 100644 --- a/src/libsystemd/sd-bus/bus-container.c +++ b/src/libsystemd/sd-bus/bus-container.c @@ -23,7 +23,6 @@ #include #include "util.h" -#include "fileio.h" #include "bus-internal.h" #include "bus-socket.h" #include "bus-container.h" diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index bd439a95dd..19aa4bd4f0 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -34,7 +34,6 @@ #include "bus-bloom.h" #include "bus-util.h" #include "capability.h" -#include "cgroup-util.h" _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) { int r; diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c index ea8a619c5a..a08391bfc2 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/sd-bus/bus-creds.c @@ -29,7 +29,6 @@ #include "audit.h" #include "bus-message.h" #include "bus-util.h" -#include "time-util.h" #include "strv.h" #include "bus-creds.h" #include "bus-label.h" diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h index 3b337efa32..5430e535f0 100644 --- a/src/libsystemd/sd-bus/bus-creds.h +++ b/src/libsystemd/sd-bus/bus-creds.h @@ -24,7 +24,6 @@ #include #include "sd-bus.h" -#include "time-util.h" struct sd_bus_creds { bool allocated; diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index 7181639645..4bc896549a 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -22,7 +22,6 @@ #include "util.h" #include "capability.h" #include "strv.h" -#include "audit.h" #include "macro.h" #include "cap-list.h" diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c index 02b95cd136..2d18a4e6c1 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.c +++ b/src/libsystemd/sd-bus/bus-gvariant.c @@ -19,7 +19,6 @@ along with systemd; If not, see . ***/ -#include "util.h" #include "bus-type.h" #include "bus-gvariant.h" #include "bus-signature.h" diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h index bebb2c2fac..1351938c80 100644 --- a/src/libsystemd/sd-bus/bus-internal.h +++ b/src/libsystemd/sd-bus/bus-internal.h @@ -22,8 +22,6 @@ ***/ #include -#include -#include #include #include "hashmap.h" diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c index d528ab2a04..e2f4550c7e 100644 --- a/src/libsystemd/sd-bus/bus-introspect.c +++ b/src/libsystemd/sd-bus/bus-introspect.c @@ -20,7 +20,6 @@ ***/ #include "util.h" -#include "sd-bus-protocol.h" #include "bus-introspect.h" #include "bus-signature.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h index 98312d123b..1914e6cb8b 100644 --- a/src/libsystemd/sd-bus/bus-introspect.h +++ b/src/libsystemd/sd-bus/bus-introspect.h @@ -21,7 +21,6 @@ along with systemd; If not, see . ***/ -#include #include #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index df772036ee..4333445f2a 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -38,7 +38,6 @@ #include "strv.h" #include "memfd-util.h" #include "capability.h" -#include "cgroup-util.h" #include "fileio.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c index 162f0ab608..a9e944c94b 100644 --- a/src/libsystemd/sd-bus/bus-match.c +++ b/src/libsystemd/sd-bus/bus-match.c @@ -22,7 +22,6 @@ #include "bus-internal.h" #include "bus-message.h" #include "bus-match.h" -#include "bus-error.h" #include "bus-util.h" #include "strv.h" diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 076b85f3b9..77216a6f49 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -27,7 +27,6 @@ #include "utf8.h" #include "strv.h" #include "time-util.h" -#include "cgroup-util.h" #include "memfd-util.h" #include "sd-bus.h" diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h index 32955329b4..a68dee42b7 100644 --- a/src/libsystemd/sd-bus/bus-message.h +++ b/src/libsystemd/sd-bus/bus-message.h @@ -23,11 +23,9 @@ #include #include -#include #include "macro.h" #include "sd-bus.h" -#include "kdbus.h" #include "time-util.h" #include "bus-creds.h" #include "bus-protocol.h" diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h index 2e06e30548..c4fed0b53d 100644 --- a/src/libsystemd/sd-bus/bus-signature.h +++ b/src/libsystemd/sd-bus/bus-signature.h @@ -22,7 +22,6 @@ ***/ #include -#include bool signature_is_single(const char *s, bool allow_dict_entry); bool signature_is_pair(const char *s); diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index 52883fa8cd..c15929c2bb 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -20,16 +20,13 @@ ***/ #include -#include #include #include #include -#include #include "util.h" #include "macro.h" #include "missing.h" -#include "strv.h" #include "utf8.h" #include "sd-daemon.h" diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c index 6be8310bbe..048178550b 100644 --- a/src/libsystemd/sd-bus/bus-track.c +++ b/src/libsystemd/sd-bus/bus-track.c @@ -20,7 +20,6 @@ ***/ #include "sd-bus.h" -#include "set.h" #include "bus-util.h" #include "bus-internal.h" #include "bus-track.h" diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libsystemd/sd-bus/bus-type.c index b7914d15d3..6bc7b880a6 100644 --- a/src/libsystemd/sd-bus/bus-type.c +++ b/src/libsystemd/sd-bus/bus-type.c @@ -19,7 +19,6 @@ along with systemd; If not, see . ***/ -#include "util.h" #include "bus-type.h" bool bus_type_is_valid(char c) { diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h index 0e507839ca..581574ab73 100644 --- a/src/libsystemd/sd-bus/bus-type.h +++ b/src/libsystemd/sd-bus/bus-type.h @@ -25,7 +25,6 @@ #include "macro.h" #include "sd-bus.h" -#include "sd-bus-protocol.h" bool bus_type_is_valid(char c) _const_; bool bus_type_is_valid_in_signature(char c) _const_; diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h index e9efa3597c..9f048711de 100644 --- a/src/libsystemd/sd-bus/bus-util.h +++ b/src/libsystemd/sd-bus/bus-util.h @@ -25,7 +25,6 @@ #include "sd-bus.h" #include "hashmap.h" #include "time-util.h" -#include "util.h" typedef enum BusTransport { BUS_TRANSPORT_LOCAL, diff --git a/src/libsystemd/sd-bus/busctl-introspect.h b/src/libsystemd/sd-bus/busctl-introspect.h index d6b4cf05a7..ea807d5973 100644 --- a/src/libsystemd/sd-bus/busctl-introspect.h +++ b/src/libsystemd/sd-bus/busctl-introspect.h @@ -21,7 +21,6 @@ along with systemd; If not, see . ***/ -#include #include typedef struct XMLIntrospectOps { diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c index d3c1772019..d52dbdfd81 100644 --- a/src/libsystemd/sd-bus/busctl.c +++ b/src/libsystemd/sd-bus/busctl.c @@ -26,12 +26,10 @@ #include "log.h" #include "build.h" #include "pager.h" -#include "xml.h" #include "path-util.h" #include "set.h" #include "sd-bus.h" -#include "bus-message.h" #include "bus-internal.h" #include "bus-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 6a7f9c04ac..58a625fedd 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -20,19 +20,16 @@ ***/ #include -#include #include #include #include #include -#include #include #include #include "util.h" #include "macro.h" #include "strv.h" -#include "set.h" #include "missing.h" #include "def.h" #include "cgroup-util.h" @@ -45,8 +42,6 @@ #include "bus-socket.h" #include "bus-kernel.h" #include "bus-control.h" -#include "bus-introspect.h" -#include "bus-signature.h" #include "bus-objects.h" #include "bus-util.h" #include "bus-container.h" diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c index 8625ee6d89..7f49fe90fa 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -29,7 +29,6 @@ #include "macro.h" #include "sd-bus.h" -#include "bus-message.h" #include "bus-error.h" #include "bus-match.h" #include "bus-internal.h" diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c index ff2602ba34..edd5033db2 100644 --- a/src/libsystemd/sd-bus/test-bus-creds.c +++ b/src/libsystemd/sd-bus/test-bus-creds.c @@ -22,7 +22,6 @@ #include "sd-bus.h" #include "bus-dump.h" #include "bus-util.h" -#include "util.h" int main(int argc, char *argv[]) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c index 67b6461f30..b2caa02870 100644 --- a/src/libsystemd/sd-bus/test-bus-introspect.c +++ b/src/libsystemd/sd-bus/test-bus-introspect.c @@ -19,7 +19,6 @@ along with systemd; If not, see . ***/ -#include "util.h" #include "log.h" #include "bus-introspect.h" diff --git a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c b/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c index 35f87e91bd..1cacb95df3 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c @@ -19,16 +19,12 @@ along with systemd; If not, see . ***/ -#include #include #include "util.h" -#include "log.h" #include "time-util.h" #include "sd-bus.h" -#include "bus-message.h" -#include "bus-error.h" #include "bus-kernel.h" #include "bus-internal.h" #include "bus-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/sd-bus/test-bus-kernel-bloom.c index 071b7e0cf9..b11c43bd7b 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c +++ b/src/libsystemd/sd-bus/test-bus-kernel-bloom.c @@ -23,8 +23,6 @@ #include "log.h" #include "sd-bus.h" -#include "bus-message.h" -#include "bus-error.h" #include "bus-kernel.h" #include "bus-util.h" diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libsystemd/sd-bus/test-bus-kernel.c index c396eac2d2..8f4f60b65f 100644 --- a/src/libsystemd/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/sd-bus/test-bus-kernel.c @@ -25,8 +25,6 @@ #include "log.h" #include "sd-bus.h" -#include "bus-message.h" -#include "bus-error.h" #include "bus-kernel.h" #include "bus-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c index d95a03c221..7569ff98be 100644 --- a/src/libsystemd/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/sd-bus/test-bus-marshal.c @@ -19,9 +19,7 @@ along with systemd; If not, see . ***/ -#include #include -#include #include #ifdef HAVE_GLIB diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c index 76ca0b6bf3..051969f9c7 100644 --- a/src/libsystemd/sd-bus/test-bus-match.c +++ b/src/libsystemd/sd-bus/test-bus-match.c @@ -20,7 +20,6 @@ ***/ #include "log.h" -#include "util.h" #include "macro.h" #include "bus-match.h" diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c index acf67a52b3..895eda4eaa 100644 --- a/src/libsystemd/sd-bus/test-bus-objects.c +++ b/src/libsystemd/sd-bus/test-bus-objects.c @@ -19,11 +19,8 @@ along with systemd; If not, see . ***/ -#include #include #include -#include -#include #include "log.h" #include "util.h" diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c index 5f807c3b1e..080d8eddb7 100644 --- a/src/libsystemd/sd-bus/test-bus-server.c +++ b/src/libsystemd/sd-bus/test-bus-server.c @@ -19,11 +19,8 @@ along with systemd; If not, see . ***/ -#include #include #include -#include -#include #include "log.h" #include "util.h" @@ -31,7 +28,6 @@ #include "sd-bus.h" #include "bus-internal.h" -#include "bus-message.h" #include "bus-util.h" struct context { diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c index 3fc565c620..4165c9273a 100644 --- a/src/libsystemd/sd-bus/test-bus-signature.c +++ b/src/libsystemd/sd-bus/test-bus-signature.c @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include -#include #include "log.h" #include "bus-signature.h" diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c index 4ea9f9fc35..2d062fc9b5 100644 --- a/src/libsystemd/sd-bus/test-bus-zero-copy.c +++ b/src/libsystemd/sd-bus/test-bus-zero-copy.c @@ -19,7 +19,6 @@ along with systemd; If not, see . ***/ -#include #include #include "util.h" @@ -28,7 +27,6 @@ #include "sd-bus.h" #include "bus-message.h" -#include "bus-error.h" #include "bus-kernel.h" #include "bus-dump.h" -- cgit v1.2.3-54-g00ecf