From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 30 Dec 2024 17:01:37 +0000 (+0000)
Subject: fr_dlist takes real objects in the list, not the `entry` pointer
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=226f71a62120a863832ef051baa906cb3e44e698;p=thirdparty%2Ffreeradius-server.git

fr_dlist takes real objects in the list, not the `entry` pointer
---

diff --git a/src/lib/util/rb_expire.c b/src/lib/util/rb_expire.c
index 5058a455cea..f04eced2bbb 100644
--- a/src/lib/util/rb_expire.c
+++ b/src/lib/util/rb_expire.c
@@ -36,7 +36,7 @@ RCSID("$Id$")
  *	- true if data was inserted.
  *	- false if data already existed and was not inserted.
  */
-bool fr_rb_expire_insert(fr_rb_expire_t *expire, void const *data, fr_time_t now)
+bool fr_rb_expire_insert(fr_rb_expire_t *expire, void *data, fr_time_t now)
 {
 	fr_dlist_t *entry = fr_dlist_item_to_entry(expire->head.offset, data);
 	fr_rb_expire_node_t *re = (fr_rb_expire_node_t *) (((uintptr_t) entry) - offsetof(fr_rb_expire_node_t, entry));
@@ -45,22 +45,22 @@ bool fr_rb_expire_insert(fr_rb_expire_t *expire, void const *data, fr_time_t now
 		fr_dlist_remove(&expire->head, entry);
 	}
 
-	fr_dlist_insert_tail(&expire->head, entry);
+	fr_dlist_insert_tail(&expire->head, data);
 
-	re->when = fr_time_add_time_delta(now, expire->lifetime);	
+	re->when = fr_time_add_time_delta(now, expire->lifetime);
 
 	return true;
 }
 
-void fr_rb_expire_update(fr_rb_expire_t *expire, void const *data, fr_time_t now)
+void fr_rb_expire_update(fr_rb_expire_t *expire, void *data, fr_time_t now)
 {
 	fr_dlist_t *entry = fr_dlist_item_to_entry(expire->head.offset, data);
 	fr_rb_expire_node_t *re = (fr_rb_expire_node_t *) (((uintptr_t) entry) - offsetof(fr_rb_expire_node_t, entry));
 
-	fr_dlist_remove(&expire->head, entry);
+	fr_dlist_remove(&expire->head, data);
 
-	fr_dlist_insert_tail(&expire->head, entry);
-	re->when = fr_time_add_time_delta(now, expire->lifetime);	
+	fr_dlist_insert_tail(&expire->head, data);
+	re->when = fr_time_add_time_delta(now, expire->lifetime);
 
 #if 0
 	/*
diff --git a/src/lib/util/rb_expire.h b/src/lib/util/rb_expire.h
index 10be8392971..5789be97b2c 100644
--- a/src/lib/util/rb_expire.h
+++ b/src/lib/util/rb_expire.h
@@ -38,8 +38,8 @@ typedef struct {
 } fr_rb_expire_t;
 
 /** dlist for expiring old entries
- *	
- *  This structure should be inside of the 
+ *
+ *  This structure should be inside of the
  */
 typedef struct {
 	fr_rb_node_t	node;
@@ -55,9 +55,9 @@ typedef struct {
 		(_expire)->last_expiry = fr_time(); \
  	} while (0)
 
-bool		fr_rb_expire_insert(fr_rb_expire_t *expire, void const *data, fr_time_t now) CC_HINT(nonnull);
+bool		fr_rb_expire_insert(fr_rb_expire_t *expire, void *data, fr_time_t now) CC_HINT(nonnull);
 
-void		fr_rb_expire_update(fr_rb_expire_t *expire, void const *data, fr_time_t now) CC_HINT(nonnull);
+void		fr_rb_expire_update(fr_rb_expire_t *expire, void *data, fr_time_t now) CC_HINT(nonnull);
 
 #ifdef __cplusplus
 }