From: Nick Porter Date: Mon, 25 Jan 2021 16:52:52 +0000 (+0000) Subject: Rename dpair.c to pair.c X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e2e8c301b29aeb8c7307d2a78bdb3f5a37cc4c3;p=thirdparty%2Ffreeradius-server.git Rename dpair.c to pair.c --- diff --git a/src/lib/io/test_point.h b/src/lib/io/test_point.h index 169e9b3bc3..3c19c59983 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 b77b22a7ca..331332cb71 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 538feb8beb..f69bbba568 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 eaa51337d6..b7c11cc609 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 34f60458c4..15e9997789 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 caac080905..618508be6b 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 51fb89d293..604222e92e 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 ccdb3b8dc5..9872c9863f 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 b2ee1c720a..e63b31000e 100644 --- a/src/lib/util/base.h +++ b/src/lib/util/base.h @@ -41,7 +41,6 @@ RCSIDH(libradius_h, "$Id$") #include #include #include -#include #include #include #include @@ -56,6 +55,7 @@ RCSIDH(libradius_h, "$Id$") #include #include #include +#include #include #include #include diff --git a/src/lib/util/dcursor.c b/src/lib/util/dcursor.c index ce80a6b491..052651741b 100644 --- a/src/lib/util/dcursor.c +++ b/src/lib/util/dcursor.c @@ -30,7 +30,7 @@ RCSID("$Id$") #include #include #include -#include +#include /** Return the first item matching the iterator in cursor a and cursor b * diff --git a/src/lib/util/libfreeradius-util.mk b/src/lib/util/libfreeradius-util.mk index 05312c3f0a..de1290bba7 100644 --- a/src/lib/util/libfreeradius-util.mk +++ b/src/lib/util/libfreeradius-util.mk @@ -20,7 +20,6 @@ SOURCES := \ dict_util.c \ dict_validate.c \ dl.c \ - dpair.c \ dpair_legacy.c \ dns.c \ event.c \ @@ -45,6 +44,7 @@ SOURCES := \ missing.c \ net.c \ packet.c \ + pair.c \ pair_print.c \ pair_tokenize.c \ paths.c \ diff --git a/src/lib/util/packet.h b/src/lib/util/packet.h index 55b030c244..f4cc491284 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/dpair.c b/src/lib/util/pair.c similarity index 99% rename from src/lib/util/dpair.c rename to src/lib/util/pair.c index 769a517f4c..91a5610c45 100644 --- a/src/lib/util/dpair.c +++ b/src/lib/util/pair.c @@ -24,8 +24,8 @@ RCSID("$Id$") #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/lib/util/dpair.h b/src/lib/util/pair.h similarity index 100% rename from src/lib/util/dpair.h rename to src/lib/util/pair.h diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c index 8c6eac51b5..8462bf1c3e 100644 --- a/src/lib/util/pair_legacy_tests.c +++ b/src/lib/util/pair_legacy_tests.c @@ -43,8 +43,8 @@ static void pair_tests_init(void); #include #include -#include #include +#include #include #include diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c index 8ea61a6fe2..a6ebe28b3e 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 42077112e9..7a33164430 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 16238e7a3a..91412ccc04 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 a81782d2a6..ceb4eac4fc 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 b93a4b8d81..2600f16731 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 730e5db246..4118186cd3 100644 --- a/src/lib/util/proto.c +++ b/src/lib/util/proto.c @@ -20,7 +20,7 @@ * * @copyright 2015 The FreeRADIUS server project */ -#include +#include #include #include diff --git a/src/lib/util/struct.h b/src/lib/util/struct.h index 3a7755e13a..157f0a7fb6 100644 --- a/src/lib/util/struct.h +++ b/src/lib/util/struct.h @@ -23,8 +23,8 @@ */ RCSIDH(struct_h, "$Id$") -#include #include +#include #include #include diff --git a/src/protocols/dhcpv4/decode.c b/src/protocols/dhcpv4/decode.c index b442ad7ad3..dc94fa7b5e 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 f3b40abc55..be62136d35 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 ca1b0b45d8..f3ec4bd36a 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 085c01a1e4..a47b39aeef 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 b71a5907c1..2c9db5a871 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 b17ae13661..46f44fea91 100644 --- a/src/protocols/dhcpv6/base.c +++ b/src/protocols/dhcpv6/base.c @@ -29,8 +29,8 @@ #include #include #include -#include #include +#include #include #include #include diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c index a2ba3cbd68..02b5afd6c6 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 abcc1fee85..371a2b7437 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/internal.h b/src/protocols/internal/internal.h index 2b02f4bd12..45fce1eba2 100644 --- a/src/protocols/internal/internal.h +++ b/src/protocols/internal/internal.h @@ -15,7 +15,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include +#include #include diff --git a/src/protocols/radius/abinary.c b/src/protocols/radius/abinary.c index 55fa0b98bd..672e356373 100644 --- a/src/protocols/radius/abinary.c +++ b/src/protocols/radius/abinary.c @@ -22,9 +22,9 @@ */ RCSID("$Id$") -#include #include #include +#include #include #include "radius.h"