From: Alan T. DeKok Date: Thu, 21 Oct 2021 17:06:18 +0000 (-0400) Subject: remove unnecessary includes X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44a45dcc856334d6c0bd741a418cc0943db7d0ab;p=thirdparty%2Ffreeradius-server.git remove unnecessary includes --- diff --git a/src/lib/curl/io.c b/src/lib/curl/io.c index 22bb491ca0d..7d632e0a371 100644 --- a/src/lib/curl/io.c +++ b/src/lib/curl/io.c @@ -24,7 +24,6 @@ #include #include #include -#include #include /* diff --git a/src/lib/io/master.c b/src/lib/io/master.c index caa38407a10..8a2238dccf1 100644 --- a/src/lib/io/master.c +++ b/src/lib/io/master.c @@ -28,8 +28,6 @@ #include #include -#include - #include #include diff --git a/src/lib/server/module.c b/src/lib/server/module.c index 657bb7c9059..4c7666be794 100644 --- a/src/lib/server/module.c +++ b/src/lib/server/module.c @@ -34,7 +34,6 @@ RCSID("$Id$") #include #include #include -#include static TALLOC_CTX *instance_ctx = NULL; static size_t instance_num = 1; diff --git a/src/lib/server/request.c b/src/lib/server/request.c index 1e7d8a5e85c..19cf78a7aef 100644 --- a/src/lib/server/request.c +++ b/src/lib/server/request.c @@ -26,7 +26,6 @@ RCSID("$Id$") #include #include -#include static request_init_args_t default_args; diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c index 4f442721959..3078c76eb79 100644 --- a/src/lib/server/trunk.c +++ b/src/lib/server/trunk.c @@ -39,7 +39,6 @@ typedef struct fr_trunk_s fr_trunk_t; #include #include -#include #include #include #include diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c index 5fc4752aa02..017a48a9d25 100644 --- a/src/lib/server/virtual_servers.c +++ b/src/lib/server/virtual_servers.c @@ -41,8 +41,6 @@ RCSID("$Id$") #include #include -#include - typedef struct { dl_module_inst_t *proto_module; //!< The proto_* module for a listen section. fr_app_t const *app; //!< Easy access to the exported struct. diff --git a/src/lib/unlang/base.c b/src/lib/unlang/base.c index 2ddf0907db8..a1efa8fee4f 100644 --- a/src/lib/unlang/base.c +++ b/src/lib/unlang/base.c @@ -24,8 +24,6 @@ */ RCSID("$Id$") -#include - #include "unlang_priv.h" static uint32_t instance_count; diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c index 5a0330695f3..b6bc15e8321 100644 --- a/src/lib/unlang/compile.c +++ b/src/lib/unlang/compile.c @@ -27,7 +27,6 @@ RCSID("$Id$") #include #include #include -#include #include #include "call_priv.h" diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c index bc00c2e1b8b..9247830d5b4 100644 --- a/src/lib/unlang/module.c +++ b/src/lib/unlang/module.c @@ -30,7 +30,6 @@ RCSID("$Id$") #include #include #include -#include #include "module_priv.h" #include "subrequest_priv.h" diff --git a/src/lib/unlang/tmpl.c b/src/lib/unlang/tmpl.c index 42ff1e8a8c0..ec91e669a55 100644 --- a/src/lib/unlang/tmpl.c +++ b/src/lib/unlang/tmpl.c @@ -26,7 +26,6 @@ RCSID("$Id$") -#include #include #include #include diff --git a/src/lib/unlang/xlat_eval.c b/src/lib/unlang/xlat_eval.c index 5d6e3013a61..523ba77e118 100644 --- a/src/lib/unlang/xlat_eval.c +++ b/src/lib/unlang/xlat_eval.c @@ -34,7 +34,6 @@ RCSID("$Id$") #include #include -#include #include /* Remove when everything uses new xlat API */ #include diff --git a/src/listen/arp/proto_arp.c b/src/listen/arp/proto_arp.c index 5995521769a..16946e46c37 100644 --- a/src/listen/arp/proto_arp.c +++ b/src/listen/arp/proto_arp.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include "proto_arp.h" diff --git a/src/listen/control/proto_control.c b/src/listen/control/proto_control.c index ff88d0d9df4..117a1c5ef9e 100644 --- a/src/listen/control/proto_control.c +++ b/src/listen/control/proto_control.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include "proto_control.h" diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c index fcd9534c112..f4f3f0fd0f4 100644 --- a/src/listen/dhcpv4/proto_dhcpv4.c +++ b/src/listen/dhcpv4/proto_dhcpv4.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "proto_dhcpv4.h" diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c index eca98054e1a..36932c16d3f 100644 --- a/src/listen/dhcpv6/proto_dhcpv6.c +++ b/src/listen/dhcpv6/proto_dhcpv6.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include "proto_dhcpv6.h" diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c index 98091b7e14e..45169779f5b 100644 --- a/src/listen/dns/proto_dns.c +++ b/src/listen/dns/proto_dns.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include "proto_dns.h" diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c index 72caae6be5e..a56cf213637 100644 --- a/src/listen/radius/proto_radius.c +++ b/src/listen/radius/proto_radius.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include "proto_radius.h" diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c index bdfe1880591..fe9344bc83b 100644 --- a/src/listen/tacacs/proto_tacacs.c +++ b/src/listen/tacacs/proto_tacacs.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c index 62e2d919e1d..ec2f7f7ab4d 100644 --- a/src/listen/vmps/proto_vmps.c +++ b/src/listen/vmps/proto_vmps.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c index af76e33ab50..a7949d53cae 100644 --- a/src/modules/proto_bfd/proto_bfd.c +++ b/src/modules/proto_bfd/proto_bfd.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c index b46616a6f28..3dfc00da218 100644 --- a/src/modules/proto_ldap_sync/proto_ldap_sync.c +++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c @@ -29,7 +29,7 @@ USES_APPLE_DEPRECATED_API #include #include -#include +#include #include #include #include diff --git a/src/modules/rlm_delay/rlm_delay.c b/src/modules/rlm_delay/rlm_delay.c index 69f33975331..c19a9fe2c71 100644 --- a/src/modules/rlm_delay/rlm_delay.c +++ b/src/modules/rlm_delay/rlm_delay.c @@ -26,7 +26,6 @@ RCSID("$Id$") #include #include -#include #include #include #include diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c index 005f7f65392..20ff906b4ea 100644 --- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c +++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c @@ -27,7 +27,7 @@ RCSID("$Id$") #include #include -#include +#include static int auth_type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent, CONF_ITEM *ci, UNUSED CONF_PARSER const *rule); diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c index d24b7bcd4fe..522a4b1a6c6 100644 --- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c +++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c @@ -22,7 +22,7 @@ RCSID("$Id$") -#include +#include #include #include diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c index 35d5b0dab92..1d597e5d8b7 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/peap.c +++ b/src/modules/rlm_eap/types/rlm_eap_peap/peap.c @@ -24,7 +24,6 @@ RCSID("$Id$") USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ -#include #include #include diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c index d1d2d2312dc..4bf3bf0602f 100644 --- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c +++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c @@ -37,8 +37,6 @@ USES_APPLE_DEPRECATED_API /* OpenSSL API has been deprecated by Apple */ # include #endif -#include - #include "rlm_eap_tls.h" typedef struct { diff --git a/src/modules/rlm_icmp/rlm_icmp.c b/src/modules/rlm_icmp/rlm_icmp.c index 411360a973f..3919919b899 100644 --- a/src/modules/rlm_icmp/rlm_icmp.c +++ b/src/modules/rlm_icmp/rlm_icmp.c @@ -28,7 +28,6 @@ RCSID("$Id$") #include #include -#include #include #include diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c index 996258c0dc4..bff32ca0a6f 100644 --- a/src/modules/rlm_radius/rlm_radius.c +++ b/src/modules/rlm_radius/rlm_radius.c @@ -27,7 +27,6 @@ RCSID("$Id$") #include #include #include -#include #include #include "rlm_radius.h" diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c index 6b28fa67867..8dbb7538ff1 100644 --- a/src/modules/rlm_radius/rlm_radius_udp.c +++ b/src/modules/rlm_radius/rlm_radius_udp.c @@ -29,7 +29,6 @@ RCSID("$Id$") #include #include #include -#include #include #include #include diff --git a/src/modules/rlm_rest/io.c b/src/modules/rlm_rest/io.c index f8b2f32a9c1..cb70300a050 100644 --- a/src/modules/rlm_rest/io.c +++ b/src/modules/rlm_rest/io.c @@ -24,7 +24,6 @@ #include "rest.h" #include #include -#include /** Handle asynchronous cancellation of a request * diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c index 268c8a3a224..8cd5520e75f 100644 --- a/src/modules/rlm_rest/rlm_rest.c +++ b/src/modules/rlm_rest/rlm_rest.c @@ -28,7 +28,6 @@ RCSID("$Id$") #include #include #include -#include #include #include #include diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c index 81765dc87e5..b5bd140fc58 100644 --- a/src/modules/rlm_sigtran/client.c +++ b/src/modules/rlm_sigtran/client.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "attrs.h" diff --git a/src/process/arp/base.c b/src/process/arp/base.c index 1569f9c349d..51dbb62242d 100644 --- a/src/process/arp/base.c +++ b/src/process/arp/base.c @@ -22,7 +22,6 @@ * @copyright 2020 Network RADIUS SARL (legal@networkradius.com) */ #include -#include #include #include #include diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c index 6cc771fbc30..c756fe2fd62 100644 --- a/src/process/dhcpv4/base.c +++ b/src/process/dhcpv4/base.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c index 9747cb691a1..8ca6c22bf7d 100644 --- a/src/process/dhcpv6/base.c +++ b/src/process/dhcpv6/base.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/process/dns/base.c b/src/process/dns/base.c index 4a9496153ee..298dfdcefda 100644 --- a/src/process/dns/base.c +++ b/src/process/dns/base.c @@ -22,7 +22,6 @@ * @copyright 2020 Network RADIUS SARL (legal@networkradius.com) */ #include -#include #include #include #include diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c index 56a76bce996..d996ba458a4 100644 --- a/src/process/tacacs/base.c +++ b/src/process/tacacs/base.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/process/tls/base.c b/src/process/tls/base.c index abf440e7bcd..8b956990fd6 100644 --- a/src/process/tls/base.c +++ b/src/process/tls/base.c @@ -22,7 +22,6 @@ * @copyright 2021 Arran Cudbard-Bell (a.cudbardb@freeradius.org) */ #include -#include #include #include diff --git a/src/process/vmps/base.c b/src/process/vmps/base.c index e6469d46340..4d981e03494 100644 --- a/src/process/vmps/base.c +++ b/src/process/vmps/base.c @@ -24,7 +24,6 @@ */ #include #include -#include #include #include #include