From 5c3e7760c5e59434ba30ccad12d0e2340e81b2af Mon Sep 17 00:00:00 2001 From: Philipp Schafft Date: Sun, 17 Jun 2018 12:28:38 +0000 Subject: [PATCH] Cleanup: Corrected headers used in headers --- src/acl.c | 1 + src/acl.h | 1 - src/admin.c | 1 + src/admin.h | 5 ----- src/auth.h | 7 ++++--- src/auth_static.c | 1 + src/client.c | 1 + src/client.h | 8 +++----- src/connection.c | 2 ++ src/connection.h | 1 - src/curl.c | 1 + src/event.c | 2 ++ src/event.h | 11 +++-------- src/event_exec.c | 1 + src/event_log.c | 2 ++ src/event_url.c | 2 ++ src/format.h | 1 + src/format_mp3.c | 1 + src/fserve.h | 3 ++- src/logging.c | 2 +- src/logging.h | 4 ++-- src/source.c | 3 +++ src/source.h | 9 +++++---- src/stats.h | 7 +++---- src/tls.c | 5 +++++ src/tls.h | 5 ----- src/xslt.h | 24 +++--------------------- 27 files changed, 50 insertions(+), 61 deletions(-) diff --git a/src/acl.c b/src/acl.c index b8fa0393..80494572 100644 --- a/src/acl.c +++ b/src/acl.c @@ -16,6 +16,7 @@ #include "acl.h" #include "admin.h" +#include "util.h" #include diff --git a/src/acl.h b/src/acl.h index 5982606d..aec52c82 100644 --- a/src/acl.h +++ b/src/acl.h @@ -19,7 +19,6 @@ #include "common/httpp/httpp.h" #include "icecasttypes.h" -#include "admin.h" typedef enum acl_policy_tag { /* Error on function call */ diff --git a/src/admin.c b/src/admin.c index b4edcf12..f0d61dae 100644 --- a/src/admin.c +++ b/src/admin.c @@ -40,6 +40,7 @@ #include "logging.h" #include "auth.h" +#include "acl.h" #ifdef _WIN32 #define snprintf _snprintf #endif diff --git a/src/admin.h b/src/admin.h index 8b3d92e4..06945d2d 100644 --- a/src/admin.h +++ b/src/admin.h @@ -16,14 +16,9 @@ #include #include -#include #include "icecasttypes.h" #include "compat.h" -#include "refbuf.h" -#include "client.h" -#include "source.h" -#include "auth.h" /* types */ #define ADMINTYPE_ERROR (-1) diff --git a/src/auth.h b/src/auth.h index 2e79bb81..12a0b17c 100644 --- a/src/auth.h +++ b/src/auth.h @@ -21,10 +21,11 @@ #include #include #include -#include "icecasttypes.h" -#include "cfgfile.h" -#include "client.h" + #include "common/thread/thread.h" +#include "common/httpp/httpp.h" + +#include "icecasttypes.h" /* implemented */ #define AUTH_TYPE_ANONYMOUS "anonymous" diff --git a/src/auth_static.c b/src/auth_static.c index 66528bfe..c5ca6880 100644 --- a/src/auth_static.c +++ b/src/auth_static.c @@ -18,6 +18,7 @@ #include #include "auth.h" +#include "cfgfile.h" #include "client.h" #include "logging.h" diff --git a/src/client.c b/src/client.c index a8863246..d80edcdf 100644 --- a/src/client.c +++ b/src/client.c @@ -42,6 +42,7 @@ #include "logging.h" #include "util.h" +#include "acl.h" /* for ADMIN_COMMAND_ERROR */ #include "admin.h" diff --git a/src/client.h b/src/client.h index 9675aada..aa9318b0 100644 --- a/src/client.h +++ b/src/client.h @@ -19,14 +19,12 @@ #ifndef __CLIENT_H__ #define __CLIENT_H__ +#include "common/httpp/httpp.h" +#include "common/httpp/encoding.h" + #include "icecasttypes.h" #include "errors.h" #include "refbuf.h" -#include "acl.h" -#include "cfgfile.h" -#include "admin.h" -#include "common/httpp/httpp.h" -#include "common/httpp/encoding.h" #define CLIENT_DEFAULT_ADMIN_FORMAT ADMIN_FORMAT_TRANSFORMED diff --git a/src/connection.c b/src/connection.c index 24485f64..7cb84e2c 100644 --- a/src/connection.c +++ b/src/connection.c @@ -51,6 +51,7 @@ #include "logging.h" #include "xslt.h" #include "fserve.h" +#include "slave.h" #include "sighandler.h" #include "yp.h" @@ -61,6 +62,7 @@ #include "auth.h" #include "matchfile.h" #include "tls.h" +#include "acl.h" #define CATMODULE "connection" diff --git a/src/connection.h b/src/connection.h index 304cd58b..3a989d7e 100644 --- a/src/connection.h +++ b/src/connection.h @@ -21,7 +21,6 @@ #include "icecasttypes.h" #include "compat.h" -#include "common/httpp/httpp.h" #include "common/thread/thread.h" #include "common/net/sock.h" diff --git a/src/curl.c b/src/curl.c index 95f2740e..7d44fc8d 100644 --- a/src/curl.c +++ b/src/curl.c @@ -11,6 +11,7 @@ #endif #include "curl.h" +#include "cfgfile.h" #include "logging.h" #define CATMODULE "curl" diff --git a/src/event.c b/src/event.c index e6420585..17b1aae8 100644 --- a/src/event.c +++ b/src/event.c @@ -21,6 +21,8 @@ #include "logging.h" #include "admin.h" #include "connection.h" +#include "client.h" +#include "cfgfile.h" #define CATMODULE "event" diff --git a/src/event.h b/src/event.h index aafc9fc8..3ef2b497 100644 --- a/src/event.h +++ b/src/event.h @@ -9,18 +9,13 @@ #ifndef __EVENT_H__ #define __EVENT_H__ -#ifdef HAVE_CONFIG_H -#include -#endif - #include #include #include -#include "common/httpp/httpp.h" -#include "cfgfile.h" -#include "client.h" -#include "source.h" +#include "common/thread/thread.h" + +#include "icecasttypes.h" /* implemented */ #define EVENT_TYPE_LOG "log" diff --git a/src/event_exec.c b/src/event_exec.c index 488c88a9..43da2568 100644 --- a/src/event_exec.c +++ b/src/event_exec.c @@ -22,6 +22,7 @@ #include "event.h" #include "global.h" +#include "source.h" #include "logging.h" #define CATMODULE "event_exec" diff --git a/src/event_log.c b/src/event_log.c index 37905c76..36f194d2 100644 --- a/src/event_log.c +++ b/src/event_log.c @@ -13,6 +13,8 @@ #include #include "event.h" +#include "util.h" +#include "cfgfile.h" #include "logging.h" #define CATMODULE "event_log" diff --git a/src/event_url.c b/src/event_url.c index a8078dbd..7176209a 100644 --- a/src/event_url.c +++ b/src/event_url.c @@ -14,6 +14,8 @@ #include "curl.h" #include "event.h" +#include "cfgfile.h" +#include "util.h" #include "logging.h" #define CATMODULE "event_url" diff --git a/src/format.h b/src/format.h index 365e2a22..aa94aa68 100644 --- a/src/format.h +++ b/src/format.h @@ -23,6 +23,7 @@ #include "icecasttypes.h" #include "client.h" #include "refbuf.h" +#include "cfgfile.h" #include "common/httpp/httpp.h" typedef enum _format_type_tag diff --git a/src/format_mp3.c b/src/format_mp3.c index ad399b72..dae620c6 100644 --- a/src/format_mp3.c +++ b/src/format_mp3.c @@ -32,6 +32,7 @@ #include "refbuf.h" #include "source.h" #include "client.h" +#include "connection.h" #include "stats.h" #include "format.h" diff --git a/src/fserve.h b/src/fserve.h index a5035100..d2408955 100644 --- a/src/fserve.h +++ b/src/fserve.h @@ -14,7 +14,8 @@ #define __FSERVE_H__ #include -#include "cfgfile.h" + +#include "icecasttypes.h" typedef void (*fserve_callback_t)(client_t *, void *); diff --git a/src/logging.c b/src/logging.c index dd78cb9f..6ae0054a 100644 --- a/src/logging.c +++ b/src/logging.c @@ -22,13 +22,13 @@ #include "common/thread/thread.h" #include "common/httpp/httpp.h" +#include "logging.h" #include "connection.h" #include "refbuf.h" #include "client.h" #include "compat.h" #include "cfgfile.h" -#include "logging.h" #include "util.h" #ifdef _WIN32 diff --git a/src/logging.h b/src/logging.h index 3a9ebc2e..36dee18d 100644 --- a/src/logging.h +++ b/src/logging.h @@ -14,10 +14,10 @@ #ifndef __LOGGING_H__ #define __LOGGING_H__ -#include "cfgfile.h" -#include "client.h" #include "common/log/log.h" +#include "icecasttypes.h" + /* declare the global log descriptors */ extern int errorlog; diff --git a/src/source.c b/src/source.c index b7ace96a..8c7bf29f 100644 --- a/src/source.c +++ b/src/source.c @@ -59,6 +59,9 @@ #include "auth.h" #include "event.h" #include "compat.h" +#include "connection.h" +#include "slave.h" +#include "acl.h" #undef CATMODULE #define CATMODULE "source" diff --git a/src/source.h b/src/source.h index a5103bc6..adb5f835 100644 --- a/src/source.h +++ b/src/source.h @@ -14,15 +14,16 @@ #ifndef __SOURCE_H__ #define __SOURCE_H__ +#include + +#include "common/thread/thread.h" +#include "common/httpp/httpp.h" + #include "icecasttypes.h" -#include "cfgfile.h" #include "yp.h" #include "util.h" #include "format.h" #include "playlist.h" -#include "common/thread/thread.h" - -#include struct source_tag { mutex_t lock; diff --git a/src/stats.h b/src/stats.h index ae70318c..3ec72214 100644 --- a/src/stats.h +++ b/src/stats.h @@ -13,14 +13,13 @@ #ifndef __STATS_H__ #define __STATS_H__ -#include "cfgfile.h" -#include "connection.h" -#include "common/httpp/httpp.h" -#include "client.h" #include #include #include +#include "icecasttypes.h" +#include "cfgfile.h" +#include "refbuf.h" typedef struct _stats_node_tag { diff --git a/src/tls.c b/src/tls.c index 360e9280..94922f88 100644 --- a/src/tls.c +++ b/src/tls.c @@ -14,6 +14,11 @@ #include #endif +#ifdef HAVE_OPENSSL +#include +#include +#endif + #include #include diff --git a/src/tls.h b/src/tls.h index 50edf047..4ba505ac 100644 --- a/src/tls.h +++ b/src/tls.h @@ -9,11 +9,6 @@ #ifndef __TLS_H__ #define __TLS_H__ -#ifdef HAVE_OPENSSL -#include -#include -#endif - #include "common/net/sock.h" /* Do we have TLS Support? */ diff --git a/src/xslt.h b/src/xslt.h index 841ceb20..97e771bd 100644 --- a/src/xslt.h +++ b/src/xslt.h @@ -11,28 +11,10 @@ */ #include -#include -#include -#include -#include -#include -#include -#include - - -#include "common/thread/thread.h" -#include "common/avl/avl.h" -#include "common/httpp/httpp.h" -#include "common/net/sock.h" - - -#include "connection.h" - -#include "global.h" -#include "refbuf.h" -#include "client.h" -#include "stats.h" +#include +#include +#include "icecasttypes.h" void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client); void xslt_initialize(void);