From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 17 Sep 2024 19:25:27 +0000 (-0400)
Subject: fr_pair_delete() returns "int", not prev pair
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a2a7813e653dac9ff479f01f5f2d52f2cc9177;p=thirdparty%2Ffreeradius-server.git

fr_pair_delete() returns "int", not prev pair
---

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 06f97f55d4f..721395c196e 100644
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -1814,16 +1814,14 @@ int fr_pair_delete_by_child_num(fr_pair_list_t *list, fr_dict_attr_t const *pare
  *
  * @param[in] list	of value pairs to remove VP from.
  * @param[in] vp	to remove
- * @return previous item in the list to the one being removed.
+ * @return
+ *	- <0 on error: pair wasn't deleted
+ *	- 0 on success
  */
-fr_pair_t *fr_pair_delete(fr_pair_list_t *list, fr_pair_t *vp)
+int fr_pair_delete(fr_pair_list_t *list, fr_pair_t *vp)
 {
-	fr_pair_t *prev;
-
-	prev = fr_pair_remove(list, vp);
-	talloc_free(vp);
-
-	return prev;
+	fr_pair_remove(list, vp);
+	return talloc_free(vp);
 }
 
 /** Order attributes by their da, and tag
diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
index 776799edd49..3a11d9d0cf2 100644
--- a/src/lib/util/pair.h
+++ b/src/lib/util/pair.h
@@ -538,7 +538,7 @@ int		fr_pair_delete_by_da(fr_pair_list_t *head, fr_dict_attr_t const *da) CC_HIN
 
 int		fr_pair_delete_by_da_nested(fr_pair_list_t *list, fr_dict_attr_t const *da) CC_HINT(nonnull);
 
-fr_pair_t	*fr_pair_delete(fr_pair_list_t *list, fr_pair_t *vp) CC_HINT(nonnull);
+int		fr_pair_delete(fr_pair_list_t *list, fr_pair_t *vp) CC_HINT(nonnull);
 
 /* functions for FR_TYPE_STRUCTURAL */
 fr_pair_list_t	*fr_pair_children(fr_pair_t *head) CC_HINT(nonnull);