From: Alan T. DeKok Date: Thu, 21 Oct 2021 15:03:45 +0000 (-0400) Subject: run min_includes.pl on these files X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af5442859e09c7315e21851afe6c5aa36fa48329;p=thirdparty%2Ffreeradius-server.git run min_includes.pl on these files which removes extraneous includes. Not that it does not reorder the includes, or try to figure out which includes are necessary for what. That may be better done by something like include-what-you-use, but the output of that tool requires substantial work to understand. --- diff --git a/src/lib/util/atexit.c b/src/lib/util/atexit.c index d9335fd5c8a..74976e87046 100644 --- a/src/lib/util/atexit.c +++ b/src/lib/util/atexit.c @@ -28,13 +28,9 @@ RCSID("$Id$") #include #include -#include #include -#include -#include -#include #include #if defined(DEBUG_THREAD_LOCAL) && !defined(NDEBUG) diff --git a/src/lib/util/base32.c b/src/lib/util/base32.c index 164a010fc26..8da1f32d820 100644 --- a/src/lib/util/base32.c +++ b/src/lib/util/base32.c @@ -26,7 +26,6 @@ RCSID("$Id$") #include "base32.h" -#include #include #define us(x) (uint8_t) x diff --git a/src/lib/util/base64.c b/src/lib/util/base64.c index fe486ce7706..51c1146a0ab 100644 --- a/src/lib/util/base64.c +++ b/src/lib/util/base64.c @@ -26,7 +26,6 @@ RCSID("$Id$") #include "base64.h" -#include #include #define us(x) (uint8_t) x diff --git a/src/lib/util/cursor.c b/src/lib/util/cursor.c index c5d8ee05221..b5559fdce38 100644 --- a/src/lib/util/cursor.c +++ b/src/lib/util/cursor.c @@ -29,7 +29,6 @@ RCSID("$Id$") #include #include #include -#include #define NEXT_PTR(_v) ((void **)(((uint8_t *)(_v)) + cursor->offset)) diff --git a/src/lib/util/dbuff_tests.c b/src/lib/util/dbuff_tests.c index ebdf70e2849..1d52876ba8f 100644 --- a/src/lib/util/dbuff_tests.c +++ b/src/lib/util/dbuff_tests.c @@ -1,6 +1,5 @@ #include #include -#include #include "dbuff.h" diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c index 67eda5cff20..dcd03eb60b1 100644 --- a/src/lib/util/debug.c +++ b/src/lib/util/debug.c @@ -23,23 +23,14 @@ */ #include #include -#include #include #include -#include -#include -#include #include -#include -#include -#include #include #include -#include #include #include -#include #if defined(HAVE_MALLOPT) && defined(HAVE_MALLOC_H) # include @@ -63,7 +54,6 @@ #ifdef HAVE_SYS_PTRACE_H # include -# include # if !defined(PT_ATTACH) && defined(PTRACE_ATTACH) # define PT_ATTACH PTRACE_ATTACH # endif diff --git a/src/lib/util/dict_ext.c b/src/lib/util/dict_ext.c index 697e9efff6c..486e3bfec24 100644 --- a/src/lib/util/dict_ext.c +++ b/src/lib/util/dict_ext.c @@ -24,7 +24,6 @@ RCSID("$Id$") #include -#include #include #include #include diff --git a/src/lib/util/dict_tokenize.c b/src/lib/util/dict_tokenize.c index 5396f2743f4..1535a06add2 100644 --- a/src/lib/util/dict_tokenize.c +++ b/src/lib/util/dict_tokenize.c @@ -25,14 +25,11 @@ RCSID("$Id$") #include #include #include -#include #include #include #include -#include #include -#include #define MAX_ARGV (16) diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c index 7a714168c89..3550502785d 100644 --- a/src/lib/util/dict_util.c +++ b/src/lib/util/dict_util.c @@ -24,16 +24,10 @@ RCSID("$Id$") #include #include -#include -#include -#include -#include #include #include #include -#include -#include #ifdef HAVE_SYS_STAT_H # include #endif diff --git a/src/lib/util/dl.c b/src/lib/util/dl.c index 2df38cdb3b1..3ef3a2ae2cd 100644 --- a/src/lib/util/dl.c +++ b/src/lib/util/dl.c @@ -29,12 +29,10 @@ RCSID("$Id$") #include #include -#include #include #include #include -#include #ifdef HAVE_VALGRIND_H # include diff --git a/src/lib/util/dns.c b/src/lib/util/dns.c index c2d4cb44ac9..6792edcddb9 100644 --- a/src/lib/util/dns.c +++ b/src/lib/util/dns.c @@ -25,7 +25,6 @@ RCSID("$Id$") #include #include -#include #include #include #include diff --git a/src/lib/util/dpair_legacy.c b/src/lib/util/dpair_legacy.c index 130cda91122..4f59f5d0fac 100644 --- a/src/lib/util/dpair_legacy.c +++ b/src/lib/util/dpair_legacy.c @@ -25,15 +25,12 @@ RCSID("$Id$") #include #include #include -#include #include #include -#include #include #include -#include fr_sbuff_term_t const bareword_terminals = FR_SBUFF_TERMS( diff --git a/src/lib/util/event.c b/src/lib/util/event.c index b6612256dfc..aefa06ce994 100644 --- a/src/lib/util/event.c +++ b/src/lib/util/event.c @@ -32,13 +32,10 @@ RCSID("$Id$") #include #include #include -#include #include #include #include #include -#include -#include #include #include diff --git a/src/lib/util/ext.c b/src/lib/util/ext.c index ad0c7ea2390..bfa07ef9869 100644 --- a/src/lib/util/ext.c +++ b/src/lib/util/ext.c @@ -27,8 +27,6 @@ RCSID("$Id$") #include #include #include -#include -#include /** Add a variable length extension to a talloc chunk * diff --git a/src/lib/util/file.c b/src/lib/util/file.c index 2f448cf11a6..80e9ac7156f 100644 --- a/src/lib/util/file.c +++ b/src/lib/util/file.c @@ -31,7 +31,6 @@ RCSID("$Id$") #include #include #include -#include #include static ssize_t _fr_mkdir(int *fd_out, char const *path, mode_t mode, fr_mkdir_func_t func, void *uctx) diff --git a/src/lib/util/fuzzer.c b/src/lib/util/fuzzer.c index 82c76d19e73..fdd78b4b9f8 100644 --- a/src/lib/util/fuzzer.c +++ b/src/lib/util/fuzzer.c @@ -23,7 +23,6 @@ RCSID("$Id$") #include -#include static int decode_test_ctx(void **out, UNUSED TALLOC_CTX *ctx) { diff --git a/src/lib/util/hash.c b/src/lib/util/hash.c index a90c707167e..79e0a2c4bd5 100644 --- a/src/lib/util/hash.c +++ b/src/lib/util/hash.c @@ -33,7 +33,6 @@ RCSID("$Id$") #include -#include /* * A reasonable number of buckets to start off with. diff --git a/src/lib/util/inet.c b/src/lib/util/inet.c index ab01f3eb128..012c3100f90 100644 --- a/src/lib/util/inet.c +++ b/src/lib/util/inet.c @@ -26,12 +26,7 @@ #include #include -#include -#include #include -#include -#include -#include #include #ifdef HAVE_LINUX_IF_PACKET_H diff --git a/src/lib/util/log.c b/src/lib/util/log.c index c8175dd5898..5f2302587a9 100644 --- a/src/lib/util/log.c +++ b/src/lib/util/log.c @@ -26,7 +26,6 @@ RCSID("$Id$") #include #include #include -#include #include #include #include @@ -35,12 +34,9 @@ RCSID("$Id$") #ifdef HAVE_FEATURES_H # include #endif -#include #ifdef HAVE_SYSLOG_H # include #endif -#include -#include FILE *fr_log_fp = NULL; int fr_debug_lvl = 0; diff --git a/src/lib/util/misc.c b/src/lib/util/misc.c index b726d423280..e0ec8642a7d 100644 --- a/src/lib/util/misc.c +++ b/src/lib/util/misc.c @@ -23,26 +23,15 @@ RCSID("$Id$") #include -#include -#include #include -#include #include -#include -#include -#include #include #include #include -#include -#include -#include #include #include -#include #include -#include #define FR_PUT_LE16(a, val)\ do {\ diff --git a/src/lib/util/packet.c b/src/lib/util/packet.c index 2535ce4b4af..d5216f58cd2 100644 --- a/src/lib/util/packet.c +++ b/src/lib/util/packet.c @@ -25,7 +25,6 @@ RCSID("$Id$") #include #include #include -#include /** Allocate a new fr_radius_packet_t * diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c index b1d344a5690..375ceba7353 100644 --- a/src/lib/util/pair.c +++ b/src/lib/util/pair.c @@ -29,12 +29,9 @@ RCSID("$Id$") #include #include #include -#include #include #include -#include -#include /** Initialise a pair list header * diff --git a/src/lib/util/pair_legacy.c b/src/lib/util/pair_legacy.c index 59f112277eb..e997a90b396 100644 --- a/src/lib/util/pair_legacy.c +++ b/src/lib/util/pair_legacy.c @@ -25,15 +25,12 @@ RCSID("$Id$") #include #include #include -#include #include #include -#include #include #include -#include static fr_sbuff_term_t const bareword_terminals = FR_SBUFF_TERMS( diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c index fd3526b2dac..abca9cc7f0a 100644 --- a/src/lib/util/pair_legacy_tests.c +++ b/src/lib/util/pair_legacy_tests.c @@ -45,9 +45,7 @@ static void test_init(void); #include #include -#include #include -#include #ifdef HAVE_GPERFTOOLS_PROFILER_H # include diff --git a/src/lib/util/pair_tests.c b/src/lib/util/pair_tests.c index 84e065d793b..92eff8b49a8 100644 --- a/src/lib/util/pair_tests.c +++ b/src/lib/util/pair_tests.c @@ -45,9 +45,6 @@ static void test_init(void); #include #include -#include -#include -#include #ifdef HAVE_GPERFTOOLS_PROFILER_H # include diff --git a/src/lib/util/pair_tokenize.c b/src/lib/util/pair_tokenize.c index 40614ca4403..58310f61f06 100644 --- a/src/lib/util/pair_tokenize.c +++ b/src/lib/util/pair_tokenize.c @@ -24,15 +24,12 @@ RCSID("$Id$") #include #include -#include #include #include -#include #include #include -#include static ssize_t op_to_token(fr_token_t *token, char const *op, size_t oplen) { diff --git a/src/lib/util/pcap.c b/src/lib/util/pcap.c index ceb4eac4fc0..55a88ff79f4 100644 --- a/src/lib/util/pcap.c +++ b/src/lib/util/pcap.c @@ -26,17 +26,11 @@ #include #include #include -#include #include -#include #include #include -#include -#include -#include #include -#include #ifndef SIOCGIFHWADDR # include diff --git a/src/lib/util/print.c b/src/lib/util/print.c index 8b18607b0d1..5ca29bba2f6 100644 --- a/src/lib/util/print.c +++ b/src/lib/util/print.c @@ -26,12 +26,7 @@ RCSID("$Id$") #include #include #include -#include -#include -#include -#include -#include /** Checks for utf-8, taken from http://www.w3.org/International/questions/qa-forms-utf-8 * diff --git a/src/lib/util/rand.c b/src/lib/util/rand.c index 54527610ada..032e35f32d1 100644 --- a/src/lib/util/rand.c +++ b/src/lib/util/rand.c @@ -25,12 +25,8 @@ RCSID("$Id$") #include #include -#include #include #include -#include -#include -#include static _Thread_local fr_randctx fr_rand_pool; //!< A pool of pre-generated random integers static _Thread_local bool fr_rand_initialized = false; diff --git a/src/lib/util/rb_tests.c b/src/lib/util/rb_tests.c index 37c84d012b9..49981399198 100644 --- a/src/lib/util/rb_tests.c +++ b/src/lib/util/rb_tests.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "rb.c" diff --git a/src/lib/util/regex.c b/src/lib/util/regex.c index 291d4d148ea..86981c6f698 100644 --- a/src/lib/util/regex.c +++ b/src/lib/util/regex.c @@ -26,11 +26,7 @@ RCSID("$Id$") #ifdef HAVE_REGEX #include -#include -#include #include -#include -#include #if defined(HAVE_REGEX_PCRE) || (defined(HAVE_REGEX_PCRE2) && defined(PCRE2_CONFIG_JIT)) #ifndef FR_PCRE_JIT_STACK_MIN diff --git a/src/lib/util/sbuff.c b/src/lib/util/sbuff.c index 7449c9c2ba5..eae7cc5f6f9 100644 --- a/src/lib/util/sbuff.c +++ b/src/lib/util/sbuff.c @@ -23,17 +23,9 @@ RCSID("$Id$") #include -#include -#include -#include #include -#include #include -#include -#include -#include -#include static _Thread_local char *sbuff_scratch; diff --git a/src/lib/util/socket.c b/src/lib/util/socket.c index a6c25beeab3..cb49d9970f8 100644 --- a/src/lib/util/socket.c +++ b/src/lib/util/socket.c @@ -34,12 +34,8 @@ #include #include -#include -#include -#include #ifndef SO_BINDTODEVICE -#include #endif #include diff --git a/src/lib/util/strerror.c b/src/lib/util/strerror.c index 613084b63fb..eb50b1853fd 100644 --- a/src/lib/util/strerror.c +++ b/src/lib/util/strerror.c @@ -24,7 +24,6 @@ RCSID("$Id$") #include -#include #include #include diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c index c3865039d67..9ff0aa9a289 100644 --- a/src/lib/util/struct.c +++ b/src/lib/util/struct.c @@ -24,7 +24,6 @@ RCSID("$Id$") #include -#include fr_pair_t *fr_raw_from_network(TALLOC_CTX *ctx, fr_dict_attr_t const *parent, uint8_t const *data, size_t data_len) { diff --git a/src/lib/util/syserror.c b/src/lib/util/syserror.c index 19559c03290..14e6c8a8839 100644 --- a/src/lib/util/syserror.c +++ b/src/lib/util/syserror.c @@ -27,12 +27,7 @@ RCSID("$Id$") #include #include #include -#include -#include -#include -#include -#include #define FR_SYSERROR_BUFSIZE (2048) diff --git a/src/lib/util/table.c b/src/lib/util/table.c index 598ae00acb3..3b25cba85c7 100644 --- a/src/lib/util/table.c +++ b/src/lib/util/table.c @@ -27,7 +27,6 @@ RCSID("$Id$") #include #include -#include #define TABLE_IDX(_table, _idx, _element_size) (((uint8_t const *)(_table)) + ((_idx) * (_element_size))) #define ELEM_STR(_offset) (*((fr_table_elem_t const *)(_offset))).str diff --git a/src/lib/util/talloc.c b/src/lib/util/talloc.c index 90e9458e98f..73d637b7fe9 100644 --- a/src/lib/util/talloc.c +++ b/src/lib/util/talloc.c @@ -25,13 +25,9 @@ RCSID("$Id$") #include #include -#include #include -#include #include -#include -#include static _Thread_local TALLOC_CTX *thread_local_ctx; diff --git a/src/lib/util/time.c b/src/lib/util/time.c index 74106027b1a..51d84222e18 100644 --- a/src/lib/util/time.c +++ b/src/lib/util/time.c @@ -27,10 +27,6 @@ RCSID("$Id$") #include #include -#include -#include -#include -#include /* * Avoid too many ifdef's later in the code. @@ -51,7 +47,6 @@ USES_APPLE_DEPRECATED_API # include #endif -#include _Atomic int64_t our_realtime; //!< realtime at the start of the epoch in nanoseconds. static char const *tz_names[2] = { NULL, NULL }; //!< normal, DST, from localtime_r(), tm_zone diff --git a/src/lib/util/token.c b/src/lib/util/token.c index aea660375f0..7dcc829d7a1 100644 --- a/src/lib/util/token.c +++ b/src/lib/util/token.c @@ -29,8 +29,6 @@ RCSID("$Id$") #include #include -#include -#include fr_table_num_ordered_t const fr_tokens_table[] = { { L("=~"), T_OP_REG_EQ }, /* order is important! */ diff --git a/src/lib/util/trie.c b/src/lib/util/trie.c index 88a26d28f99..c4419c0497a 100644 --- a/src/lib/util/trie.c +++ b/src/lib/util/trie.c @@ -25,11 +25,8 @@ RCSID("$Id$") #include #include #include -#include #include -#include -#include /* * This file implements path-compressed, level-compressed diff --git a/src/lib/util/udpfromto.c b/src/lib/util/udpfromto.c index bd4cf805080..f59b9c6945b 100644 --- a/src/lib/util/udpfromto.c +++ b/src/lib/util/udpfromto.c @@ -31,13 +31,7 @@ RCSID("$Id$") # include #endif -#include #include -#include -#include -#include -#include -#include /* * More portability idiocy diff --git a/src/lib/util/value.c b/src/lib/util/value.c index 175323012ae..184d321dd47 100644 --- a/src/lib/util/value.c +++ b/src/lib/util/value.c @@ -50,15 +50,8 @@ RCSID("$Id$") #include #include -#include -#include #include -#include -#include -#include -#include -#include /** Sanity checks *