Skip to content

Commit e082baf

Browse files
alandekokalandekok
committed
run scripts/build/min-includes.pl
to minimize the number of duplicate includes
1 parent 94998a2 commit e082baf

File tree

179 files changed

+10
-437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+10
-437
lines changed

‎src/bin/dhcpclient.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ RCSID("$Id$")
3030
#include <freeradius-devel/util/pair_legacy.h>
3131
#include <freeradius-devel/server/packet.h>
3232
#include <freeradius-devel/dhcpv4/dhcpv4.h>
33-
#include <freeradius-devel/util/pcap.h>
3433

3534
/*
3635
* Logging macros

‎src/bin/fuzzer.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ RCSID("$Id$")
2828
#include <freeradius-devel/util/conf.h>
2929
#include <freeradius-devel/util/dict.h>
3030
#include <freeradius-devel/util/proto.h>
31-
#include <freeradius-devel/util/atexit.h>
3231
#include <freeradius-devel/util/syserror.h>
33-
#include <freeradius-devel/util/strerror.h>
3432
#include <freeradius-devel/io/test_point.h>
3533

3634
/*

‎src/bin/radclient-ng.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,12 @@ RCSID("$Id$")
4242
#ifdef HAVE_OPENSSL_SSL_H
4343
#include <openssl/ssl.h>
4444
#include <freeradius-devel/util/md4.h>
45-
#include <freeradius-devel/util/md5.h>
4645
#endif
47-
#include <ctype.h>
4846

4947
#ifdef HAVE_GETOPT_H
5048
# include <getopt.h>
5149
#endif
5250

53-
#include <assert.h>
5451

5552
typedef struct request_s request_t; /* to shut up warnings about mschap.h */
5653

‎src/bin/radclient.c‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,13 @@ RCSID("$Id$")
3838
#include <freeradius-devel/util/chap.h>
3939
#ifdef HAVE_OPENSSL_SSL_H
4040
#include <openssl/ssl.h>
41-
#include <freeradius-devel/util/md5.h>
4241
#include <freeradius-devel/util/md4.h>
4342
#endif
44-
#include <ctype.h>
4543

4644
#ifdef HAVE_GETOPT_H
4745
# include <getopt.h>
4846
#endif
4947

50-
#include <assert.h>
5148

5249
typedef struct request_s request_t; /* to shut up warnings about mschap.h */
5350

@@ -60,7 +57,7 @@ typedef struct request_s request_t; /* to shut up warnings about mschap.h */
6057
_attr = fr_pair_find_by_da(&request->request_pairs, NULL, _da); \
6158
if (!_attr) { \
6259
_attr = fr_pair_afrom_da(request, _da); \
63-
assert(_attr != NULL); \
60+
fr_assert(_attr != NULL); \
6461
fr_pair_append(&request->request_pairs, _attr); \
6562
} \
6663
} while (0)
@@ -492,7 +489,7 @@ static int radclient_init(TALLOC_CTX *ctx, rc_file_pair_t *files)
492489
bool coa_reply_done = false;
493490
bool coa_filter_done = false;
494491

495-
assert(files->packets != NULL);
492+
fr_assert(files->packets != NULL);
496493

497494
/*
498495
* Determine where to read the VP's from.
@@ -953,7 +950,7 @@ static void deallocate_id(rc_request_t *request)
953950
*/
954951
static int send_one_packet(rc_request_t *request)
955952
{
956-
assert(request->done == false);
953+
fr_assert(request->done == false);
957954

958955
#ifdef STATIC_ANALYZER
959956
if (!secret) fr_exit_now(1);
@@ -973,7 +970,7 @@ static int send_one_packet(rc_request_t *request)
973970
if (!request->tries || request->packet->id == -1) {
974971
bool rcode;
975972

976-
assert(request->reply == NULL);
973+
fr_assert(request->reply == NULL);
977974

978975
/*
979976
* Didn't find a free packet ID, we're not done,
@@ -1018,8 +1015,8 @@ static int send_one_packet(rc_request_t *request)
10181015
goto retry;
10191016
}
10201017

1021-
assert(request->packet->id != -1);
1022-
assert(request->packet->data == NULL);
1018+
fr_assert(request->packet->id != -1);
1019+
fr_assert(request->packet->data == NULL);
10231020

10241021
/*
10251022
* Update the password, so it can be encrypted with the
@@ -1092,7 +1089,7 @@ static int send_one_packet(rc_request_t *request)
10921089
* We're not trying later, maybe the packet is done.
10931090
*/
10941091
if (request->tries == retries) {
1095-
assert(request->packet->id >= 0);
1092+
fr_assert(request->packet->id >= 0);
10961093

10971094
/*
10981095
* Delete the request from the tree of
@@ -1206,7 +1203,7 @@ static int recv_coa_packet(fr_time_delta_t wait_time)
12061203
talloc_free(packet);
12071204
return 0;
12081205
}
1209-
assert(parent->coa);
1206+
fr_assert(parent->coa);
12101207

12111208
request = parent->coa;
12121209
request->packet = talloc_steal(request, packet);
@@ -2210,8 +2207,8 @@ int main(int argc, char **argv)
22102207
}
22112208
}
22122209
} else { /* haven't sent this packet, we're not done */
2213-
assert(this->done == false);
2214-
assert(this->reply == NULL);
2210+
fr_assert(this->done == false);
2211+
fr_assert(this->reply == NULL);
22152212
done = false;
22162213
}
22172214
}

‎src/bin/radiusd.c‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@
3030
RCSID("$Id$")
3131

3232
#include <freeradius-devel/server/base.h>
33-
#include <freeradius-devel/server/dependency.h>
34-
#include <freeradius-devel/server/map_proc.h>
35-
#include <freeradius-devel/server/module.h>
3633
#include <freeradius-devel/server/radmin.h>
3734
#include <freeradius-devel/server/snmp.h>
38-
#include <freeradius-devel/server/state.h>
39-
#include <freeradius-devel/server/virtual_servers.h>
40-
#include <freeradius-devel/util/debug.h>
4135
#include <freeradius-devel/util/size.h>
42-
#include <freeradius-devel/util/strerror.h>
4336

4437
#include <freeradius-devel/tls/base.h>
4538
#include <freeradius-devel/tls/log.h>
@@ -54,7 +47,6 @@ RCSID("$Id$")
5447
#endif
5548

5649
#include <fcntl.h>
57-
#include <signal.h>
5850
#include <sys/file.h>
5951
#include <sys/mman.h>
6052

‎src/bin/radlock.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ RCSID("$Id$")
2929
#include <freeradius-devel/util/sem.h>
3030
#include <freeradius-devel/util/value.h>
3131
#include <freeradius-devel/util/syserror.h>
32-
#include <freeradius-devel/util/strerror.h>
3332

34-
#include <ctype.h>
35-
#include <stdarg.h>
3633
#include <sys/ipc.h>
3734
#include <sys/sem.h>
3835

‎src/bin/radmin.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ RCSID("$Id$")
3030
#include <freeradius-devel/util/debug.h>
3131
#include <freeradius-devel/server/radmin.h>
3232

33-
#include <freeradius-devel/util/dict.h>
3433
#include <freeradius-devel/util/misc.h>
3534
#include <freeradius-devel/util/socket.h>
3635

@@ -40,7 +39,6 @@ RCSID("$Id$")
4039
* Readline headers aren't compliant
4140
*/
4241
DIAG_OFF(strict-prototypes)
43-
# include <stdio.h>
4442
#if defined(HAVE_READLINE_READLINE_H)
4543
# include <readline/readline.h>
4644
# define USE_READLINE (1)

‎src/bin/radsizes.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#include <stdio.h>
22

33
#include <freeradius-devel/unlang/xlat_priv.h>
4-
#include <freeradius-devel/server/tmpl.h>
54
#include <freeradius-devel/server/cf_priv.h>
65
#include <freeradius-devel/unlang/unlang_priv.h>
7-
#include <freeradius-devel/util/value.h>
8-
#include <freeradius-devel/util/rb.h>
96
#include <freeradius-devel/util/tlist.h>
107

118
int main(UNUSED int argc, UNUSED char **argv)

‎src/bin/radsniff.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ RCSID("$Id$")
3636
#include <freeradius-devel/util/event.h>
3737
#include <freeradius-devel/util/file.h>
3838
#include <freeradius-devel/util/syserror.h>
39-
#include <freeradius-devel/util/atexit.h>
4039
#include <freeradius-devel/util/pair_legacy.h>
4140
#include <freeradius-devel/util/base16.h>
4241
#include <freeradius-devel/util/pcap.h>

‎src/bin/unit_test_attribute.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,35 +29,29 @@ typedef struct request_s request_t;
2929

3030
#include <freeradius-devel/io/test_point.h>
3131
#include <freeradius-devel/server/cf_parse.h>
32-
#include <freeradius-devel/server/cf_util.h>
3332
#include <freeradius-devel/server/command.h>
3433
#include <freeradius-devel/server/dependency.h>
3534
#include <freeradius-devel/server/dl_module.h>
3635
#include <freeradius-devel/server/log.h>
3736
#include <freeradius-devel/server/map.h>
38-
#include <freeradius-devel/server/tmpl.h>
3937
#ifdef WITH_TLS
4038
# include <freeradius-devel/tls/base.h>
4139
#endif
4240
#include <freeradius-devel/unlang/base.h>
43-
#include <freeradius-devel/unlang/xlat.h>
4441
#include <freeradius-devel/unlang/xlat_func.h>
4542
#include <freeradius-devel/util/atexit.h>
4643
#include <freeradius-devel/util/base64.h>
4744
#include <freeradius-devel/util/calc.h>
4845
#include <freeradius-devel/util/conf.h>
49-
#include <freeradius-devel/util/dict.h>
5046
#include <freeradius-devel/util/dns.h>
5147
#include <freeradius-devel/util/file.h>
52-
#include <freeradius-devel/util/log.h>
5348
#include <freeradius-devel/util/skip.h>
5449
#include <freeradius-devel/util/pair_legacy.h>
5550
#include <freeradius-devel/util/sha1.h>
5651
#include <freeradius-devel/util/syserror.h>
5752

5853
#include <freeradius-devel/util/dict_priv.h>
5954

60-
#include <ctype.h>
6155

6256
#ifdef __clangd__
6357
# undef HAVE_SANITIZER_LSAN_INTERFACE_H
@@ -73,7 +67,6 @@ typedef struct request_s request_t;
7367
#include <assert.h>
7468
#include <fcntl.h>
7569
#include <libgen.h>
76-
#include <limits.h>
7770
#include <sys/file.h>
7871
#include <sys/stat.h>
7972
#include <sys/wait.h>

0 commit comments

Comments
 (0)