From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 14 Feb 2021 21:51:00 +0000 (+0000)
Subject: Fix redundant declarations of talloc_const_free
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a613ff0364dce8d761f2722c2aa1f753be2f87de;p=thirdparty%2Ffreeradius-server.git

Fix redundant declarations of talloc_const_free
---

diff --git a/src/lib/util/talloc.c b/src/lib/util/talloc.c
index b1ab89f3374..4a3d9bad0f7 100644
--- a/src/lib/util/talloc.c
+++ b/src/lib/util/talloc.c
@@ -736,20 +736,6 @@ void **talloc_array_null_strip(void **array)
 	return new;
 }
 
-/** Free const'd memory
- *
- * @param[in] ptr	to free.
- */
-int talloc_const_free(void const *ptr)
-{
-	void *tmp;
-
-	if (!ptr) return 0;
-
-	memcpy(&tmp, &ptr, sizeof(tmp));
-	return talloc_free(tmp);
-}
-
 /** Callback to free the autofree ctx on thread exit
  *
  */
diff --git a/src/lib/util/talloc.h b/src/lib/util/talloc.h
index 9b6f61fe4cc..c0491f3aa6e 100644
--- a/src/lib/util/talloc.h
+++ b/src/lib/util/talloc.h
@@ -191,7 +191,16 @@ void		**talloc_array_null_terminate(void **array);
 
 void		**talloc_array_null_strip(void **array);
 
-int		talloc_const_free(void const *ptr);
+/** Free const'd memory
+ *
+ * @param[in] ptr	to free.
+ */
+static inline int talloc_const_free(void const *ptr)
+{
+	if (!ptr) return 0;
+
+	return talloc_free(UNCONST(void *, ptr));
+}
 
 /** Free a list of talloced structures containing a next field
  *
diff --git a/src/tests/util/atomic_queue_test.c b/src/tests/util/atomic_queue_test.c
index 4d4ac86faf1..e1d5f42f708 100644
--- a/src/tests/util/atomic_queue_test.c
+++ b/src/tests/util/atomic_queue_test.c
@@ -23,10 +23,11 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/io/atomic_queue.h>
+#include <freeradius-devel/util/debug.h>
+#include <freeradius-devel/util/talloc.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/time.h>
-#include <freeradius-devel/util/debug.h>
 
 #ifdef HAVE_GETOPT_H
 #	include <getopt.h>
@@ -40,17 +41,10 @@ static int		debug_lvl = 0;
 /**********************************************************************/
 typedef struct request_s request_t;
 void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t *request);
-int talloc_const_free(void const *ptr);
 
 void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t *request)
 {
 }
-
-int talloc_const_free(void const *ptr)
-{
-	if (!ptr) return 0;
-	return talloc_free(UNCONST(void *, ptr));
-}
 /**********************************************************************/
 
 
diff --git a/src/tests/util/channel_test.c b/src/tests/util/channel_test.c
index e6e9d4f5f63..72273c0d172 100644
--- a/src/tests/util/channel_test.c
+++ b/src/tests/util/channel_test.c
@@ -26,6 +26,7 @@ RCSID("$Id$")
 #include <freeradius-devel/io/control.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/talloc.h>
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>
@@ -62,11 +63,6 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t c
 {
 }
 
-int talloc_const_free(void const *ptr)
-{
-	if (!ptr) return 0;
-	return talloc_free(UNCONST(void *, ptr));
-}
 /**********************************************************************/
 
 static void NEVER_RETURNS usage(void)
diff --git a/src/tests/util/control_test.c b/src/tests/util/control_test.c
index ffe4fedea66..2cda9e9a42c 100644
--- a/src/tests/util/control_test.c
+++ b/src/tests/util/control_test.c
@@ -23,9 +23,10 @@
 RCSID("$Id$")
 
 #include <freeradius-devel/io/control.h>
-#include <freeradius-devel/util/time.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/talloc.h>
+#include <freeradius-devel/util/time.h>
 
 #include <sys/event.h>
 #include <stdio.h>
@@ -53,7 +54,6 @@ static fr_ring_buffer_t *rb = NULL;
 typedef struct request_s request_t;
 request_t *request_alloc(UNUSED TALLOC_CTX *ctx, UNUSED request_init_args_t const *args);
 void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t *request);
-int talloc_const_free(void const *ptr);
 
 request_t *request_alloc(UNUSED TALLOC_CTX *ctx, UNUSED request_init_args_t const *args)
 {
@@ -64,11 +64,6 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t *
 {
 }
 
-int talloc_const_free(void const *ptr)
-{
-	if (!ptr) return 0;
-	return talloc_free(UNCONST(void *, ptr));
-}
 /**********************************************************************/
 
 static void NEVER_RETURNS usage(void)
diff --git a/src/tests/util/message_set_test.c b/src/tests/util/message_set_test.c
index 96a4dc176d0..776fe05dc14 100644
--- a/src/tests/util/message_set_test.c
+++ b/src/tests/util/message_set_test.c
@@ -26,6 +26,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/hash.h>
 #include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/talloc.h>
 
 #include <string.h>
 #include <sys/time.h>
@@ -65,7 +66,6 @@ static size_t		allocation_mask = 0x3ff;
 typedef struct request_s request_t;
 request_t *request_alloc(UNUSED TALLOC_CTX *ctx, UNUSED request_init_args_t const *args);
 void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t *request);
-int talloc_const_free(void const *ptr);
 
 request_t *request_alloc(UNUSED TALLOC_CTX *ctx, UNUSED request_init_args_t const *args)
 {
@@ -76,11 +76,6 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t *
 {
 }
 
-int talloc_const_free(void const *ptr)
-{
-	if (!ptr) return 0;
-	return talloc_free(UNCONST(void *, ptr));
-}
 /**********************************************************************/
 
 
diff --git a/src/tests/util/ring_buffer_test.c b/src/tests/util/ring_buffer_test.c
index 0268faec0c2..13c78011896 100644
--- a/src/tests/util/ring_buffer_test.c
+++ b/src/tests/util/ring_buffer_test.c
@@ -26,6 +26,7 @@ RCSID("$Id$")
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/hash.h>
 #include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/talloc.h>
 #include <string.h>
 
 #ifdef HAVE_GETOPT_H
@@ -48,7 +49,6 @@ static size_t		seed_string_len = 3;
 typedef struct request_s request_t;
 request_t *request_alloc(UNUSED TALLOC_CTX *ctx, UNUSED request_init_args_t const *args);
 void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t *request);
-int talloc_const_free(void const *ptr);
 
 request_t *request_alloc(UNUSED TALLOC_CTX *ctx, UNUSED request_init_args_t const *args)
 {
@@ -59,11 +59,6 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t *
 {
 }
 
-int talloc_const_free(void const *ptr)
-{
-	if (!ptr) return 0;
-	return talloc_free(UNCONST(void *, ptr));
-}
 /**********************************************************************/
 
 static void  alloc_blocks(fr_ring_buffer_t *rb, uint32_t *seed, UNUSED int *start, int *end)
diff --git a/src/tests/util/worker_test.c b/src/tests/util/worker_test.c
index b50f341f871..7bf5aa1eee8 100644
--- a/src/tests/util/worker_test.c
+++ b/src/tests/util/worker_test.c
@@ -27,6 +27,7 @@ RCSID("$Id$")
 #include <freeradius-devel/io/worker.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/util/syserror.h>
+#include <freeradius-devel/util/talloc.h>
 
 #ifdef HAVE_GETOPT_H
 #  include <getopt.h>
@@ -76,11 +77,6 @@ void request_verify(UNUSED char const *file, UNUSED int line, UNUSED request_t c
 {
 }
 
-int talloc_const_free(void const *ptr)
-{
-	if (!ptr) return 0;
-	return talloc_free(UNCONST(void *, ptr));
-}
 /**********************************************************************/
 
 static void NEVER_RETURNS usage(void)