diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-10-02 11:33:39 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-10-02 11:40:48 +0200 |
| commit | b08bb12b9b5bab9684b6679f997f11c755f9aa67 (patch) | |
| tree | 2828cb7b1f61d4c176f0de99d4ac951d64e825a7 | |
| parent | Merge pull request #3102 from ton31337/feature/match_blackhole_nexthops (diff) | |
| download | frr-b08bb12b9b5bab9684b6679f997f11c755f9aa67.tar.xz frr-b08bb12b9b5bab9684b6679f997f11c755f9aa67.zip | |
lib: remove deprecated list_delete()/list_free()
Deprecation time has passed.
Signed-off-by: David Lamparter <equinox@diac24.net>
| -rw-r--r-- | lib/linklist.c | 5 | ||||
| -rw-r--r-- | lib/linklist.h | 30 |
2 files changed, 0 insertions, 35 deletions
diff --git a/lib/linklist.c b/lib/linklist.c index bee9d05a2..baacd9020 100644 --- a/lib/linklist.c +++ b/lib/linklist.c @@ -248,11 +248,6 @@ void list_delete_and_null(struct list **list) *list = NULL; } -void list_delete_original(struct list *list) -{ - list_delete_and_null(&list); -} - struct listnode *listnode_lookup(struct list *list, void *data) { struct listnode *node; diff --git a/lib/linklist.h b/lib/linklist.h index f5cd44efb..53a5012e6 100644 --- a/lib/linklist.h +++ b/lib/linklist.h @@ -236,20 +236,6 @@ extern void list_sort(struct list *list, int (*cmp)(const void **, const void **)); /* - * The usage of list_delete is being transitioned to pass in - * the double pointer to remove use after free's. - * list_free usage is deprecated, it leads to memory leaks - * of the linklist nodes. Please use list_delete_and_null - * - * In Oct of 2018, rename list_delete_and_null to list_delete - * and remove list_delete_original and the list_delete #define - * Additionally remove list_free entirely - */ -#if CONFDATE > 20181001 -CPP_NOTICE("list_delete without double pointer is deprecated, please fixup") -#endif - -/* * Delete a list and NULL its pointer. * * If non-null, list->del is called with each data element. @@ -261,22 +247,6 @@ CPP_NOTICE("list_delete without double pointer is deprecated, please fixup") extern void list_delete_and_null(struct list **plist); /* - * Delete a list. - * - * If non-null, list->del is called with each data element. - * - * plist - * pointer to list pointer - */ -extern void list_delete_original(struct list *list); -#define list_delete(X) \ - list_delete_original((X)) \ - CPP_WARN("Please transition to using list_delete_and_null") -#define list_free(X) \ - list_delete_original((X)) \ - CPP_WARN("Please transition tousing list_delete_and_null") - -/* * Delete all nodes from a list without deleting the list itself. * * If non-null, list->del is called with each data element. |