Remove fr_pair_list_free_item

diff --git a/src/lib/eap_aka_sim/state_machine.c b/src/lib/eap_aka_sim/state_machine.c
index cbdcf43d1c671b2a846a0b9b9f7d3fd79c101627..415e3ba385069333675b14e5c0df16fa4f936f77 100644 (file)
--- a/src/lib/eap_aka_sim/state_machine.c
+++ b/src/lib/eap_aka_sim/state_machine.c
@@ -945,7 +945,7 @@ static void common_reply(request_t *request, eap_aka_sim_session_t *eap_aka_sim_
                        if (fr_dict_attr_common_parent(attr_eap_aka_sim_encr_data, vp->da, true)) {
                                RWDEBUG("Silently discarding &reply.%pP: Encrypted attributes not "
                                        "allowed in this round", vp);
-                               vp = fr_pair_list_free_item(&request->reply_pairs, vp);
+                               vp = fr_pair_delete(&request->reply_pairs, vp);
                                continue;
                        }
                }

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index b71fc366efad6760a00de511098ab721f44aa2aa..1a219b76a5139013d410fa66e37e79c91ec21117 100644 (file)
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -410,17 +410,6 @@ void fr_pair_list_free(fr_pair_list_t *list)
        fr_dlist_talloc_free(&list->head);
 }
 
-/** Free a given item in a pair list
- *
- * @param[in] list     to remove and free item from.
- * @param[in] vp       to free.
- * @return The vp before the freed item.
- */
-fr_pair_t *fr_pair_list_free_item(fr_pair_list_t *list, fr_pair_t *vp)
-{
-       return fr_dlist_talloc_free_item(&list->head, vp);
-}
-
 /** Is a valuepair list empty
  *
  * @param[in] list to check

diff --git a/src/lib/util/pair.h b/src/lib/util/pair.h
index 05a5b2c173ca6cb5c5e827706a18fbbfd047e624..23c3517537b51110bb70aa178676c150cacab585 100644 (file)
--- a/src/lib/util/pair.h
+++ b/src/lib/util/pair.h
@@ -186,9 +186,6 @@ int         fr_pair_steal_prepend(TALLOC_CTX *nctx, fr_pair_list_t *list, fr_pair_t *vp
 /** @hidecallergraph */
 void           fr_pair_list_free(fr_pair_list_t *list);
 
-/** @hidecallergraph */
-fr_pair_t      *fr_pair_list_free_item(fr_pair_list_t *list, fr_pair_t *vp);
-
 /** @hidecallergraph */
 bool           fr_pair_list_empty(fr_pair_list_t const *list) CC_HINT(nonnull);