Rename dpair.c to pair.c

diff --git a/src/lib/io/test_point.h b/src/lib/io/test_point.h
index 169e9b3bc3f5e1ccd5a135e6754dd097e5f492f7..3c19c5998364c045e09a755c8be444d0bda7685b 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/dcursor.h>
-#include <freeradius-devel/util/dpair.h>
+#include <freeradius-devel/util/pair.h>
 #include "proto.h"
 #include "pair.h"
 

diff --git a/src/lib/server/exec.h b/src/lib/server/exec.h
index b77b22a7ca7f6c04a9f3c5b8c85d9b0cce7c0cd1..331332cb713d9d3799e0d22bcf92b12811b1dc70 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/dpair.h>
+#include <freeradius-devel/util/pair.h>
 
 #include <sys/types.h>
 #include <talloc.h>

diff --git a/src/lib/server/log.h b/src/lib/server/log.h
index 538feb8beb260bc094b866b31a00a0f11c8286d5..f69bbba568316e1111b0edd5ac28a397c3e25200 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 eaa51337d66c60154d38e289002d9e39a1a8af42..b7c11cc6094a21a7a95776ec6b50d8c71382b68c 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/dpair.h>
+#include <freeradius-devel/util/pair.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 34f60458c4f545920891c761f5121a552f1823bd..15e9997789d3641404e9d40a5e101e347759d387 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/dpair.h>
+#include <freeradius-devel/util/pair.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 caac08090526f2aa4328b939ff3915a808adf8bf..618508be6b297cd42256b1334935e6f2b3720dfd 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/dpair.h>
+#include <freeradius-devel/util/pair.h>
 
 #include <talloc.h>
 

diff --git a/src/lib/server/users_file.h b/src/lib/server/users_file.h
index 51fb89d29363ddeaca260071a2456089ddabc46e..604222e92ed0d44840e7a708b91d8d34987a0974 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/dpair.h>
+#include <freeradius-devel/util/pair.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 ccdb3b8dc535c77ddfd9276a7feb5f2c0c2340bd..9872c9863f5e498132bca1a847991588a925d244 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/dpair.h>
+#include <freeradius-devel/util/pair.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 b2ee1c720a4ee6ac73d6979442aaef3153cbca4a..e63b31000e606f211f2f01735325b1f08e17501b 100644 (file)
--- a/src/lib/util/base.h
+++ b/src/lib/util/base.h
@@ -41,7 +41,6 @@ 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/dpair_legacy.h>
 #include <freeradius-devel/util/event.h>
 #include <freeradius-devel/util/fifo.h>
@@ -56,6 +55,7 @@ RCSIDH(libradius_h, "$Id$")
 #include <freeradius-devel/util/md4.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/packet.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/dcursor.c b/src/lib/util/dcursor.c
index ce80a6b4919e724188b5f11e10a66f1c7dc5bf25..052651741b84d943170731ee7784b48cac8753bb 100644 (file)
--- a/src/lib/util/dcursor.c
+++ b/src/lib/util/dcursor.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 #include <string.h>
 #include <stdint.h>
 #include <freeradius-devel/util/dcursor.h>
-#include <freeradius-devel/util/dpair.h>
+#include <freeradius-devel/util/pair.h>
 
 /** 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 05312c3f0a4767f498b0446f0929938791f5375c..de1290bba71124d4bc5d34f481bbb2252c86821a 100644 (file)
--- 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 55b030c244250542f5ba7f086071b1207c9d4478..f4cc49128439ea596a58ecff3dd3022f52a464d0 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/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 769a517f4cabbc1e9061855fe709e3537c440730..91a5610c4571d0776bbe9fa286aeb475e4aeb98c 100644 (file)
--- a/src/lib/util/dpair.c
+++ b/src/lib/util/pair.c
@@ -24,8 +24,8 @@ RCSID("$Id$")
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/misc.h>
-#include <freeradius-devel/util/dpair.h>
-#include <freeradius-devel/util/dpair_legacy.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>
 #include <freeradius-devel/util/regex.h>

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 8c6eac51b56f2f4d787ecb33ff52f7e3c9d25bed..8462bf1c3e73c4957709695780f6eb6a3bbb3b4f 100644 (file)
--- 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 <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>
-#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/dpair_legacy.h>
+#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/talloc.h>
 
 #include <freeradius-devel/radius/radius.h>

diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c
index 8ea61a6fe202b175cf774b506bb23504fb8b95d3..a6ebe28b3ed6ace02516e3c565abd7c003b96f10 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/dpair.h>
+#include <freeradius-devel/util/pair.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 42077112e91c41db6c387bf9c0869ffc6570aec6..7a33164430828d3c6216e8d6ea4c5336ae00a969 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/dpair.h>
+#include <freeradius-devel/util/pair.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 16238e7a3a3d873f9601cdabe1d4f1f1051a3a3a..91412ccc0496652457d92049a2e426f970999491 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 a81782d2a64c7d1e1b19dd44d9ec04640c97bf45..ceb4eac4fc0895762ca237bcb835a1b7e2a20693 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 b93a4b8d81efa4f69ca2b944c59ee1add0df978c..2600f16731b1b02d32d8db31e43c7967682821b9 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 730e5db246d4e78e0fcbdb50afd337128ab447f5..4118186cd3c843fc55cbce1e495c437c8d64df81 100644 (file)
--- a/src/lib/util/proto.c
+++ b/src/lib/util/proto.c
@@ -20,7 +20,7 @@
  *
  * @copyright 2015 The FreeRADIUS server project
  */
-#include <freeradius-devel/util/dpair.h>
+#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/print.h>
 #include <freeradius-devel/util/proto.h>
 

diff --git a/src/lib/util/struct.h b/src/lib/util/struct.h
index 3a7755e13a1915a2ff45b9ac324e47d68cf7baeb..157f0a7fb60b7330dd3358b3b6c689ac1f511278 100644 (file)
--- a/src/lib/util/struct.h
+++ b/src/lib/util/struct.h
@@ -23,8 +23,8 @@
  */
 RCSIDH(struct_h, "$Id$")
 
-#include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/dcursor.h>
+#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/util/proto.h>
 

diff --git a/src/protocols/dhcpv4/decode.c b/src/protocols/dhcpv4/decode.c
index b442ad7ad37484af2fe373dff45e85d4267ece29..dc94fa7b5e2da898ae4ecd05cf663af707230ec0 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/dpair.h>
+#include <freeradius-devel/util/pair.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 f3b40abc55b829234a4fb4d2204b9f2f81708893..be62136d355c50bc9c7b5ac0798f521bb4e3ba2f 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/dpair.h>
+#include <freeradius-devel/util/pair.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 ca1b0b45d8c73a366b12ed12d35347d11bfe03f9..f3ec4bd36a5ef9a3d98667d8b537b416689af5d7 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/dpair.h>
+#include <freeradius-devel/util/pair.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 085c01a1e4c1da2a4c4c2c5b291e139f9caa073b..a47b39aeef97d3b8cec3d7c56de8772c3c102efb 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 b71a5907c143241a97ad8aaee7eba91d6d912be1..2c9db5a87159dedf6cb0d8e5adadbdb98b61131e 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/dpair.h>
+#include <freeradius-devel/util/pair.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 b17ae136616b8bbba181bf66dbd72dfb318360f9..46f44fea91d83b78269794f9cb521fa90a121013 100644 (file)
--- a/src/protocols/dhcpv6/base.c
+++ b/src/protocols/dhcpv6/base.c
@@ -29,8 +29,8 @@
 #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/dpair.h>
 #include <freeradius-devel/util/proto.h>
+#include <freeradius-devel/util/pair.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/talloc.h>
 #include <freeradius-devel/util/types.h>

diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c
index a2ba3cbd6894318f7fbad575ba909effe1857d85..02b5afd6c653c60d957a0d63055e63ab3bfe0fa4 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/dpair.h>
+#include <freeradius-devel/util/pair.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 abcc1fee85043598fc27e460cc45010c987f1db4..371a2b7437f61ccf80a097577bc134545ef1d91a 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/dpair.h>
+#include <freeradius-devel/util/pair.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/internal.h b/src/protocols/internal/internal.h
index 2b02f4bd1246ab425a5b1849af3abbb4ef4df7b6..45fce1eba2980e9bd0ef9820d9a079146a441ac4 100644 (file)
--- 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 <freeradius-devel/util/dpair.h>
+#include <freeradius-devel/util/pair.h>
 
 #include <talloc.h>
 

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