From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 25 Jan 2021 11:29:07 +0000 (+0000)
Subject: Replace references to cursor.h with dcursor.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d22bd1989421fb620f775f355f975c8ce4adaddc;p=thirdparty%2Ffreeradius-server.git

Replace references to cursor.h with dcursor.h

and remove un-used references to cursor.h
---

diff --git a/src/lib/io/pair.h b/src/lib/io/pair.h
index e4f8a8541d..f8082aade5 100644
--- a/src/lib/io/pair.h
+++ b/src/lib/io/pair.h
@@ -23,7 +23,7 @@
  *
  * @copyright 2017-2020 The FreeRADIUS project
  */
-#include <freeradius-devel/util/cursor.h>
+#include <freeradius-devel/util/dcursor.h>
 #include <freeradius-devel/util/value.h>
 
 /** @name Encoder errors
diff --git a/src/lib/io/test_point.h b/src/lib/io/test_point.h
index babfc053f5..087d8bc2d8 100644
--- a/src/lib/io/test_point.h
+++ b/src/lib/io/test_point.h
@@ -14,7 +14,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <freeradius-devel/util/cursor.h>
+#include <freeradius-devel/util/dcursor.h>
 #include <freeradius-devel/util/dpair.h>
 #include "proto.h"
 #include "pair.h"
diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index 24e2c2226f..e6d0b696c8 100644
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -36,7 +36,6 @@ RCSID("$Id$")
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/util.h>
 #include <freeradius-devel/server/virtual_servers.h>
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/syserror.h>
diff --git a/src/lib/server/dl_module.c b/src/lib/server/dl_module.c
index 7a14f5b516..c1ea0d1bca 100644
--- a/src/lib/server/dl_module.c
+++ b/src/lib/server/dl_module.c
@@ -29,7 +29,6 @@ RCSID("$Id$")
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/util/debug.h>
 
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/dl.h>
 #include <freeradius-devel/util/syserror.h>
 
diff --git a/src/lib/util/base.h b/src/lib/util/base.h
index 52d47e6993..b2ee1c720a 100644
--- a/src/lib/util/base.h
+++ b/src/lib/util/base.h
@@ -36,6 +36,7 @@ RCSIDH(libradius_h, "$Id$")
 #include <freeradius-devel/util/base64.h>
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/cursor.h>
+#include <freeradius-devel/util/dcursor.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/dlist.h>
diff --git a/src/lib/util/dns.c b/src/lib/util/dns.c
index 9a9dbdf505..eb89182243 100644
--- a/src/lib/util/dns.c
+++ b/src/lib/util/dns.c
@@ -23,7 +23,6 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/misc.h>
 #include <freeradius-devel/util/strerror.h>
 #include <freeradius-devel/util/talloc.h>
diff --git a/src/lib/util/dpair_legacy.h b/src/lib/util/dpair_legacy.h
index 4ed4681f17..c4e622209c 100644
--- a/src/lib/util/dpair_legacy.h
+++ b/src/lib/util/dpair_legacy.h
@@ -25,7 +25,7 @@ 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/dcursor.h>
 #include <freeradius-devel/util/dpair.h>
 #include <freeradius-devel/util/value.h>
 #include <freeradius-devel/util/token.h>
diff --git a/src/lib/util/struct.h b/src/lib/util/struct.h
index 6a85aafabf..3a7755e13a 100644
--- a/src/lib/util/struct.h
+++ b/src/lib/util/struct.h
@@ -24,8 +24,8 @@
 RCSIDH(struct_h, "$Id$")
 
 #include <freeradius-devel/util/dpair.h>
+#include <freeradius-devel/util/dcursor.h>
 #include <freeradius-devel/util/value.h>
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/proto.h>
 
 #ifdef __cplusplus
diff --git a/src/protocols/arp/arp.h b/src/protocols/arp/arp.h
index c30344e856..c85814ff7b 100644
--- a/src/protocols/arp/arp.h
+++ b/src/protocols/arp/arp.h
@@ -23,7 +23,6 @@
  *
  * @copyright 2020 Network RADIUS SARL <legal@networkradius.com>
  */
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/log.h>
diff --git a/src/protocols/internal/decode.c b/src/protocols/internal/decode.c
index 874b3de001..6d6bddeab0 100644
--- a/src/protocols/internal/decode.c
+++ b/src/protocols/internal/decode.c
@@ -29,7 +29,6 @@
 #include <freeradius-devel/internal/internal.h>
 #include <freeradius-devel/io/pair.h>
 #include <freeradius-devel/io/test_point.h>
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/net.h>
 #include <freeradius-devel/util/proto.h>
diff --git a/src/protocols/internal/encode.c b/src/protocols/internal/encode.c
index 5a8e2cb318..8b97c17551 100644
--- a/src/protocols/internal/encode.c
+++ b/src/protocols/internal/encode.c
@@ -28,7 +28,6 @@
 #include <freeradius-devel/internal/internal.h>
 #include <freeradius-devel/io/pair.h>
 #include <freeradius-devel/io/test_point.h>
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/net.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 6a29c9acc1..2b02f4bd12 100644
--- a/src/protocols/internal/internal.h
+++ b/src/protocols/internal/internal.h
@@ -15,7 +15,6 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/dpair.h>
 
 #include <talloc.h>
diff --git a/src/protocols/radius/radius.h b/src/protocols/radius/radius.h
index 81512e5fd6..f48c1b5000 100644
--- a/src/protocols/radius/radius.h
+++ b/src/protocols/radius/radius.h
@@ -24,7 +24,6 @@
  * @copyright 1999-2017 The FreeRADIUS server project
  */
 #include <freeradius-devel/radius/defs.h>
-#include <freeradius-devel/util/cursor.h>
 #include <freeradius-devel/util/packet.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/log.h>