From: Nick Porter Date: Mon, 25 Jan 2021 10:21:50 +0000 (+0000) Subject: Replace util/pair.h with util/dpair.h X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1be3ab400e13ae3fb6767d86b3dc8e235c454c63;p=thirdparty%2Ffreeradius-server.git Replace util/pair.h with util/dpair.h --- diff --git a/src/lib/io/test_point.h b/src/lib/io/test_point.h index 6eae9fb7e5..babfc053f5 100644 --- a/src/lib/io/test_point.h +++ b/src/lib/io/test_point.h @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include -#include +#include #include "proto.h" #include "pair.h" diff --git a/src/lib/server/exec.h b/src/lib/server/exec.h index 331332cb71..b77b22a7ca 100644 --- a/src/lib/server/exec.h +++ b/src/lib/server/exec.h @@ -38,7 +38,7 @@ extern "C" { #endif #include -#include +#include #include #include diff --git a/src/lib/server/log.h b/src/lib/server/log.h index f69bbba568..538feb8beb 100644 --- a/src/lib/server/log.h +++ b/src/lib/server/log.h @@ -39,8 +39,8 @@ extern "C" { typedef struct log_dst log_dst_t; #include +#include #include -#include /** Logging callback to write log messages to a destination * diff --git a/src/lib/server/pair_server_tests.c b/src/lib/server/pair_server_tests.c index b7c11cc609..eaa51337d6 100644 --- a/src/lib/server/pair_server_tests.c +++ b/src/lib/server/pair_server_tests.c @@ -44,7 +44,7 @@ static void pair_tests_init(void); #include #include -#include +#include #include #include diff --git a/src/lib/server/paircmp.h b/src/lib/server/paircmp.h index 15e9997789..34f60458c4 100644 --- a/src/lib/server/paircmp.h +++ b/src/lib/server/paircmp.h @@ -32,7 +32,7 @@ extern "C" { #include #include -#include +#include /* for paircmp_register */ typedef int (*RAD_COMPARE_FUNC)(void *instance, request_t *,fr_pair_list_t *, fr_pair_t *); diff --git a/src/lib/server/trigger.h b/src/lib/server/trigger.h index 618508be6b..caac080905 100644 --- a/src/lib/server/trigger.h +++ b/src/lib/server/trigger.h @@ -32,7 +32,7 @@ extern "C" { #include #include #include -#include +#include #include diff --git a/src/lib/server/users_file.h b/src/lib/server/users_file.h index 604222e92e..51fb89d293 100644 --- a/src/lib/server/users_file.h +++ b/src/lib/server/users_file.h @@ -31,7 +31,7 @@ RCSIDH(users_file_h, "$Id$") extern "C" { #endif -#include +#include #include #include diff --git a/src/lib/unlang/xlat.h b/src/lib/unlang/xlat.h index 9872c9863f..ccdb3b8dc5 100644 --- a/src/lib/unlang/xlat.h +++ b/src/lib/unlang/xlat.h @@ -49,7 +49,7 @@ typedef struct xlat_exp xlat_exp_t; #include #include -#include +#include #include #include diff --git a/src/lib/util/base.h b/src/lib/util/base.h index 0b95eabc72..840050cae8 100644 --- a/src/lib/util/base.h +++ b/src/lib/util/base.h @@ -40,6 +40,7 @@ RCSIDH(libradius_h, "$Id$") #include #include #include +#include #include #include #include @@ -54,7 +55,6 @@ RCSIDH(libradius_h, "$Id$") #include #include #include -#include #include #include #include diff --git a/src/lib/util/dpair_legacy.c b/src/lib/util/dpair_legacy.c index e9e444e7c3..923a28eff8 100644 --- a/src/lib/util/dpair_legacy.c +++ b/src/lib/util/dpair_legacy.c @@ -22,8 +22,8 @@ */ RCSID("$Id$") +#include #include -#include #include #include #include diff --git a/src/lib/util/dpair_legacy.h b/src/lib/util/dpair_legacy.h index 90636df8c8..4ed4681f17 100644 --- a/src/lib/util/dpair_legacy.h +++ b/src/lib/util/dpair_legacy.h @@ -17,7 +17,7 @@ /** Legacy API functions - DO NOT USE IN NEW CODE * - * @file src/lib/util/pair.h + * @file src/lib/util/dpair.h * * @copyright 2015 The FreeRADIUS server project */ @@ -26,9 +26,9 @@ RCSIDH(pair_legacy_h, "$Id$") #include #include #include +#include #include #include -#include #ifdef __cplusplus extern "C" { diff --git a/src/lib/util/packet.h b/src/lib/util/packet.h index f4cc491284..55b030c244 100644 --- a/src/lib/util/packet.h +++ b/src/lib/util/packet.h @@ -29,8 +29,8 @@ extern "C" { #include #include +#include #include -#include #include #include #include diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c index f4156186f7..b13cd0c495 100644 --- a/src/lib/util/pair_legacy_tests.c +++ b/src/lib/util/pair_legacy_tests.c @@ -43,7 +43,7 @@ static void pair_tests_init(void); #include #include -#include +#include #include #include diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c index a6ebe28b3e..8ea61a6fe2 100644 --- a/src/lib/util/pair_print.c +++ b/src/lib/util/pair_print.c @@ -20,7 +20,7 @@ * * @copyright 2020 The FreeRADIUS server project */ -#include +#include #include /** Print the value of an attribute to a string diff --git a/src/lib/util/pair_tests.c b/src/lib/util/pair_tests.c index 7a33164430..42077112e9 100644 --- a/src/lib/util/pair_tests.c +++ b/src/lib/util/pair_tests.c @@ -43,7 +43,7 @@ static void pair_tests_init(void); #include #include -#include +#include #include #include diff --git a/src/lib/util/pair_tokenize.c b/src/lib/util/pair_tokenize.c index 91412ccc04..16238e7a3a 100644 --- a/src/lib/util/pair_tokenize.c +++ b/src/lib/util/pair_tokenize.c @@ -22,8 +22,8 @@ */ RCSID("$Id$") +#include #include -#include #include #include #include diff --git a/src/lib/util/pcap.c b/src/lib/util/pcap.c index ceb4eac4fc..a81782d2a6 100644 --- a/src/lib/util/pcap.c +++ b/src/lib/util/pcap.c @@ -23,8 +23,8 @@ #ifdef HAVE_LIBPCAP #include +#include #include -#include #include #include #include diff --git a/src/lib/util/print.c b/src/lib/util/print.c index 2600f16731..b93a4b8d81 100644 --- a/src/lib/util/print.c +++ b/src/lib/util/print.c @@ -23,8 +23,8 @@ RCSID("$Id$") #include +#include #include -#include #include #include #include diff --git a/src/lib/util/proto.c b/src/lib/util/proto.c index 772968fc39..730e5db246 100644 --- a/src/lib/util/proto.c +++ b/src/lib/util/proto.c @@ -20,9 +20,9 @@ * * @copyright 2015 The FreeRADIUS server project */ +#include #include #include -#include void fr_proto_print(char const *file, int line, char const *fmt, ...) { diff --git a/src/lib/util/struct.h b/src/lib/util/struct.h index 53e53a83ce..6a85aafabf 100644 --- a/src/lib/util/struct.h +++ b/src/lib/util/struct.h @@ -23,9 +23,9 @@ */ RCSIDH(struct_h, "$Id$") +#include #include #include -#include #include #ifdef __cplusplus diff --git a/src/protocols/dhcpv4/decode.c b/src/protocols/dhcpv4/decode.c index dc94fa7b5e..b442ad7ad3 100644 --- a/src/protocols/dhcpv4/decode.c +++ b/src/protocols/dhcpv4/decode.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/protocols/dhcpv4/encode.c b/src/protocols/dhcpv4/encode.c index be62136d35..f3b40abc55 100644 --- a/src/protocols/dhcpv4/encode.c +++ b/src/protocols/dhcpv4/encode.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/protocols/dhcpv4/packet.c b/src/protocols/dhcpv4/packet.c index f3ec4bd36a..ca1b0b45d8 100644 --- a/src/protocols/dhcpv4/packet.c +++ b/src/protocols/dhcpv4/packet.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include "dhcpv4.h" diff --git a/src/protocols/dhcpv4/raw.c b/src/protocols/dhcpv4/raw.c index a47b39aeef..085c01a1e4 100644 --- a/src/protocols/dhcpv4/raw.c +++ b/src/protocols/dhcpv4/raw.c @@ -26,8 +26,8 @@ #include "attrs.h" #include "dhcpv4.h" +#include #include -#include #include #include #include diff --git a/src/protocols/dhcpv4/udp.c b/src/protocols/dhcpv4/udp.c index 2c9db5a871..b71a5907c1 100644 --- a/src/protocols/dhcpv4/udp.c +++ b/src/protocols/dhcpv4/udp.c @@ -26,7 +26,7 @@ #include "dhcpv4.h" #include "attrs.h" -#include +#include #include #include #include diff --git a/src/protocols/dhcpv6/base.c b/src/protocols/dhcpv6/base.c index e526e9017e..b17ae13661 100644 --- a/src/protocols/dhcpv6/base.c +++ b/src/protocols/dhcpv6/base.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c index 02b5afd6c6..a2ba3cbd68 100644 --- a/src/protocols/dhcpv6/decode.c +++ b/src/protocols/dhcpv6/decode.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/protocols/dhcpv6/encode.c b/src/protocols/dhcpv6/encode.c index 371a2b7437..abcc1fee85 100644 --- a/src/protocols/dhcpv6/encode.c +++ b/src/protocols/dhcpv6/encode.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/protocols/internal/decode.c b/src/protocols/internal/decode.c index 55f3abad39..874b3de001 100644 --- a/src/protocols/internal/decode.c +++ b/src/protocols/internal/decode.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include diff --git a/src/protocols/internal/encode.c b/src/protocols/internal/encode.c index a69ff3fcdb..5a8e2cb318 100644 --- a/src/protocols/internal/encode.c +++ b/src/protocols/internal/encode.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/src/protocols/internal/internal.h b/src/protocols/internal/internal.h index f73487c16b..6a29c9acc1 100644 --- a/src/protocols/internal/internal.h +++ b/src/protocols/internal/internal.h @@ -16,7 +16,7 @@ */ #include -#include +#include #include diff --git a/src/protocols/radius/abinary.c b/src/protocols/radius/abinary.c index 2077875896..55fa0b98bd 100644 --- a/src/protocols/radius/abinary.c +++ b/src/protocols/radius/abinary.c @@ -22,10 +22,10 @@ */ RCSID("$Id$") +#include #include #include #include -#include #include "radius.h"