fr_pair_delete() returns "int", not prev pair

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 06f97f55d4fdec49a6c089e8acb3e91d8f7002ea..721395c196ed4d2d338759c6270043585e97fcc4 100644 (file)
--- 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 776799edd49810829715e9ca59e87b53a29bef24..3a11d9d0cf2627fb5a7ebab2487d9d0150d5bd80 100644 (file)
--- 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);