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 6eae9fb7e5bd5100be1685bbe7e0ab199da34cd0..babfc053f514fcd734bcc039c37938aee018b4aa 100644 (file)
--- 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 <freeradius-devel/util/cursor.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include "proto.h"
 #include "pair.h"
 

diff --git a/src/lib/server/exec.h b/src/lib/server/exec.h
index 331332cb713d9d3799e0d22bcf92b12811b1dc70..b77b22a7ca7f6c04a9f3c5b8c85d9b0cce7c0cd1 100644 (file)
--- a/src/lib/server/exec.h
+++ b/src/lib/server/exec.h
@@ -38,7 +38,7 @@ extern "C" {
 #endif
 
 #include <freeradius-devel/server/request.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 
 #include <sys/types.h>
 #include <talloc.h>

diff --git a/src/lib/server/log.h b/src/lib/server/log.h
index f69bbba568316e1111b0edd5ac28a397c3e25200..538feb8beb260bc094b866b31a00a0f11c8286d5 100644 (file)
--- 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 <freeradius-devel/server/request.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/log.h>
-#include <freeradius-devel/util/pair.h>
 
 /** 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 b7c11cc6094a21a7a95776ec6b50d8c71382b68c..eaa51337d66c60154d38e289002d9e39a1a8af42 100644 (file)
--- 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 <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/server/pair.h>

diff --git a/src/lib/server/paircmp.h b/src/lib/server/paircmp.h
index 15e9997789d3641404e9d40a5e101e347759d387..34f60458c4f545920891c761f5121a552f1823bd 100644 (file)
--- a/src/lib/server/paircmp.h
+++ b/src/lib/server/paircmp.h
@@ -32,7 +32,7 @@ extern "C" {
 
 #include <freeradius-devel/server/request.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 
 /* 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 618508be6b297cd42256b1334935e6f2b3720dfd..caac08090526f2aa4328b939ff3915a808adf8bf 100644 (file)
--- a/src/lib/server/trigger.h
+++ b/src/lib/server/trigger.h
@@ -32,7 +32,7 @@ extern "C" {
 #include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/server/request.h>
 #include <freeradius-devel/server/module.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 
 #include <talloc.h>
 

diff --git a/src/lib/server/users_file.h b/src/lib/server/users_file.h
index 604222e92ed0d44840e7a708b91d8d34987a0974..51fb89d29363ddeaca260071a2456089ddabc46e 100644 (file)
--- 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 <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/server/map.h>
 #include <talloc.h>
 

diff --git a/src/lib/unlang/xlat.h b/src/lib/unlang/xlat.h
index 9872c9863f5e498132bca1a847991588a925d244..ccdb3b8dc535c77ddfd9276a7feb5f2c0c2340bd 100644 (file)
--- a/src/lib/unlang/xlat.h
+++ b/src/lib/unlang/xlat.h
@@ -49,7 +49,7 @@ typedef struct xlat_exp xlat_exp_t;
 
 #include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/time.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/util/sbuff.h>
 

diff --git a/src/lib/util/base.h b/src/lib/util/base.h
index 0b95eabc726f43e7411df03b8b6ba38b46e5cc46..840050cae8cc2891b45e092e3a619b3b3d951f02 100644 (file)
--- a/src/lib/util/base.h
+++ b/src/lib/util/base.h
@@ -40,6 +40,7 @@ RCSIDH(libradius_h, "$Id$")
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/dlist.h>
 #include <freeradius-devel/util/dns.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/fifo.h>
 #include <freeradius-devel/util/file.h>
@@ -54,7 +55,6 @@ RCSIDH(libradius_h, "$Id$")
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/pair_legacy.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/rand.h>

diff --git a/src/lib/util/dpair_legacy.c b/src/lib/util/dpair_legacy.c
index e9e444e7c3e9cb96f9f56c5ae6af51ad92321d83..923a28eff8aefa274cb63d0c1e7098453b12d751 100644 (file)
--- a/src/lib/util/dpair_legacy.c
+++ b/src/lib/util/dpair_legacy.c
@@ -22,8 +22,8 @@
  */
 RCSID("$Id$")
 
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>

diff --git a/src/lib/util/dpair_legacy.h b/src/lib/util/dpair_legacy.h
index 90636df8c85de55bb4728dc40666223e5c9ed4b2..4ed4681f174049874eb63bb24c75c54a78cc7906 100644 (file)
--- 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 <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
 #include <freeradius-devel/util/cursor.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/util/token.h>
-#include <freeradius-devel/util/pair.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/lib/util/packet.h b/src/lib/util/packet.h
index f4cc49128439ea596a58ecff3dd3022f52a464d0..55b030c244250542f5ba7f086071b1207c9d4478 100644 (file)
--- a/src/lib/util/packet.h
+++ b/src/lib/util/packet.h
@@ -29,8 +29,8 @@ extern "C" {
 
 #include <freeradius-devel/build.h>
 #include <freeradius-devel/missing.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/inet.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/rbtree.h>
 #include <freeradius-devel/util/socket.h>
 #include <freeradius-devel/util/talloc.h>

diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c
index f4156186f7e3e6c6a6314340f8b9db15742c841c..b13cd0c49551c5d481ef705752aff9502df9e6d2 100644 (file)
--- 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 <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/pair_legacy.h>
 #include <freeradius-devel/util/talloc.h>
 

diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c
index a6ebe28b3ed6ace02516e3c565abd7c003b96f10..8ea61a6fe202b175cf774b506bb23504fb8b95d3 100644 (file)
--- 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 <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/talloc.h>
 
 /** 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 7a33164430828d3c6216e8d6ea4c5336ae00a969..42077112e91c41db6c387bf9c0869ffc6570aec6 100644 (file)
--- 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 <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/radius/radius.h>

diff --git a/src/lib/util/pair_tokenize.c b/src/lib/util/pair_tokenize.c
index 91412ccc0496652457d92049a2e426f970999491..16238e7a3a3d873f9601cdabe1d4f1f1051a3a3a 100644 (file)
--- a/src/lib/util/pair_tokenize.c
+++ b/src/lib/util/pair_tokenize.c
@@ -22,8 +22,8 @@
  */
 RCSID("$Id$")
 
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/regex.h>

diff --git a/src/lib/util/pcap.c b/src/lib/util/pcap.c
index ceb4eac4fc0895762ca237bcb835a1b7e2a20693..a81782d2a64c7d1e1b19dd44d9ec04640c97bf45 100644 (file)
--- a/src/lib/util/pcap.c
+++ b/src/lib/util/pcap.c
@@ -23,8 +23,8 @@
 #ifdef HAVE_LIBPCAP
 
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/net.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/pcap.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/syserror.h>

diff --git a/src/lib/util/print.c b/src/lib/util/print.c
index 2600f16731b1b02d32d8db31e43c7967682821b9..b93a4b8d81efa4f69ca2b944c59ee1add0df978c 100644 (file)
--- a/src/lib/util/print.c
+++ b/src/lib/util/print.c
@@ -23,8 +23,8 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/hex.h>
 #include <freeradius-devel/util/strerror.h>

diff --git a/src/lib/util/proto.c b/src/lib/util/proto.c
index 772968fc3963b2ec489f3062e2c092a074a54535..730e5db246d4e78e0fcbdb50afd337128ab447f5 100644 (file)
--- a/src/lib/util/proto.c
+++ b/src/lib/util/proto.c
@@ -20,9 +20,9 @@
  *
  * @copyright 2015 The FreeRADIUS server project
  */
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
-#include <freeradius-devel/util/pair.h>
 
 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 53e53a83ce5c055c06d4aab5a3ee253cec651ca9..6a85aafabf92f7af858c19e1cd7aa278239a8ea4 100644 (file)
--- a/src/lib/util/struct.h
+++ b/src/lib/util/struct.h
@@ -23,9 +23,9 @@
  */
 RCSIDH(struct_h, "$Id$")
 
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/util/cursor.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/proto.h>
 
 #ifdef __cplusplus

diff --git a/src/protocols/dhcpv4/decode.c b/src/protocols/dhcpv4/decode.c
index dc94fa7b5e2da898ae4ecd05cf663af707230ec0..b442ad7ad37484af2fe373dff45e85d4267ece29 100644 (file)
--- a/src/protocols/dhcpv4/decode.c
+++ b/src/protocols/dhcpv4/decode.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <talloc.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/struct.h>
 #include <freeradius-devel/util/types.h>
 #include <freeradius-devel/util/proto.h>

diff --git a/src/protocols/dhcpv4/encode.c b/src/protocols/dhcpv4/encode.c
index be62136d355c50bc9c7b5ac0798f521bb4e3ba2f..f3b40abc55b829234a4fb4d2204b9f2f81708893 100644 (file)
--- a/src/protocols/dhcpv4/encode.c
+++ b/src/protocols/dhcpv4/encode.c
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <talloc.h>
 #include <freeradius-devel/util/dbuff.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/types.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/io/test_point.h>

diff --git a/src/protocols/dhcpv4/packet.c b/src/protocols/dhcpv4/packet.c
index f3ec4bd36a5ef9a3d98667d8b537b416689af5d7..ca1b0b45d8c73a366b12ed12d35347d11bfe03f9 100644 (file)
--- a/src/protocols/dhcpv4/packet.c
+++ b/src/protocols/dhcpv4/packet.c
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <talloc.h>
 #include <freeradius-devel/util/base.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/types.h>
 #include <freeradius-devel/protocol/dhcpv4/rfc2131.h>
 #include "dhcpv4.h"

diff --git a/src/protocols/dhcpv4/raw.c b/src/protocols/dhcpv4/raw.c
index a47b39aeef97d3b8cec3d7c56de8772c3c102efb..085c01a1e4c1da2a4c4c2c5b291e139f9caa073b 100644 (file)
--- a/src/protocols/dhcpv4/raw.c
+++ b/src/protocols/dhcpv4/raw.c
@@ -26,8 +26,8 @@
 #include "attrs.h"
 #include "dhcpv4.h"
 
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/net.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/types.h>

diff --git a/src/protocols/dhcpv4/udp.c b/src/protocols/dhcpv4/udp.c
index 2c9db5a87159dedf6cb0d8e5adadbdb98b61131e..b71a5907c143241a97ad8aaee7eba91d6d912be1 100644 (file)
--- a/src/protocols/dhcpv4/udp.c
+++ b/src/protocols/dhcpv4/udp.c
@@ -26,7 +26,7 @@
 #include "dhcpv4.h"
 #include "attrs.h"
 
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/types.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/udpfromto.h>

diff --git a/src/protocols/dhcpv6/base.c b/src/protocols/dhcpv6/base.c
index e526e9017eb34cf1feed12f3d0ae251a73997857..b17ae136616b8bbba181bf66dbd72dfb318360f9 100644 (file)
--- a/src/protocols/dhcpv6/base.c
+++ b/src/protocols/dhcpv6/base.c
@@ -29,7 +29,7 @@
 #include <freeradius-devel/protocol/dhcpv6/freeradius.internal.h>
 #include <freeradius-devel/protocol/dhcpv6/rfc3315.h>
 #include <freeradius-devel/protocol/dhcpv6/rfc5007.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/talloc.h>

diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c
index 02b5afd6c653c60d957a0d63055e63ab3bfe0fa4..a2ba3cbd6894318f7fbad575ba909effe1857d85 100644 (file)
--- a/src/protocols/dhcpv6/decode.c
+++ b/src/protocols/dhcpv6/decode.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <talloc.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/types.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/dns.h>

diff --git a/src/protocols/dhcpv6/encode.c b/src/protocols/dhcpv6/encode.c
index 371a2b7437f61ccf80a097577bc134545ef1d91a..abcc1fee85043598fc27e460cc45010c987f1db4 100644 (file)
--- a/src/protocols/dhcpv6/encode.c
+++ b/src/protocols/dhcpv6/encode.c
@@ -29,7 +29,7 @@
 #include <stddef.h>
 #include <talloc.h>
 #include <freeradius-devel/util/dbuff.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/types.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/struct.h>

diff --git a/src/protocols/internal/decode.c b/src/protocols/internal/decode.c
index 55f3abad39ca71ef5bcb2b9118330774531125d8..874b3de001e6ea66bcc4c69d0b61092ce7fa4838 100644 (file)
--- a/src/protocols/internal/decode.c
+++ b/src/protocols/internal/decode.c
@@ -32,7 +32,6 @@
 #include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/net.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/dbuff.h>
 

diff --git a/src/protocols/internal/encode.c b/src/protocols/internal/encode.c
index a69ff3fcdbe6108284c6052b0e801694cb7142fb..5a8e2cb318e3331a6128add1f86ddbfa47310240 100644 (file)
--- a/src/protocols/internal/encode.c
+++ b/src/protocols/internal/encode.c
@@ -30,7 +30,6 @@
 #include <freeradius-devel/io/test_point.h>
 #include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/net.h>
-#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/proto.h>
 #include <freeradius-devel/util/dbuff.h>
 

diff --git a/src/protocols/internal/internal.h b/src/protocols/internal/internal.h
index f73487c16b38f0f5146f69e1fcff5321d4d48790..6a29c9acc1b36ce3986f6d73a0bd6a3fa3052ba0 100644 (file)
--- a/src/protocols/internal/internal.h
+++ b/src/protocols/internal/internal.h
@@ -16,7 +16,7 @@
  */
 
 #include <freeradius-devel/util/cursor.h>
-#include <freeradius-devel/util/pair.h>
+#include <freeradius-devel/util/dpair.h>
 
 #include <talloc.h>
 

diff --git a/src/protocols/radius/abinary.c b/src/protocols/radius/abinary.c
index 20778758960c652bc8f790406eed86f753e7fa93..55fa0b98bd3b329b7263b32b39c7d9e1a20e5a06 100644 (file)
--- a/src/protocols/radius/abinary.c
+++ b/src/protocols/radius/abinary.c
@@ -22,10 +22,10 @@
  */
 RCSID("$Id$")
 
+#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/hex.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/talloc.h>
-#include <freeradius-devel/util/pair.h>
 
 #include "radius.h"